Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 17484) +++ /applications/editors/josm/i18n/po/ar.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 13:47+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:24+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,77 +17,80 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\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" -#: ../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 "" -#: ../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 @@ -97,154 +100,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] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" +msgstr[3] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" +msgstr[4] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" +msgstr[5] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" + +#: ../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 "تجاهل URL سيئة التكوين: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -269,7 +282,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" @@ -307,5 +321,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" @@ -329,6 +343,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,13 +359,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -360,5 +381,5 @@ msgstr "" -#: ../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 "" @@ -368,11 +389,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -381,5 +402,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 "" @@ -396,11 +417,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 @@ -429,5 +450,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 "خط العرض" @@ -436,30 +457,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 @@ -473,6 +494,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 @@ -480,58 +501,57 @@ 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 "" @@ -540,10 +560,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -552,5 +572,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -559,46 +579,46 @@ msgstr "" -#: ../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 "" -#: ../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 @@ -608,22 +628,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 "الرجاء إختر على الأقل طريقتين للدمج." @@ -634,4 +654,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 " @@ -639,13 +663,13 @@ msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +msgid "Reverse and Combine" +msgstr "أعكس ثم إدمج" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -653,31 +677,26 @@ msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -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: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 " @@ -685,32 +704,32 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -720,20 +739,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 "أحذف" @@ -743,85 +762,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 "نزّل من أو.أس.أم ..." -#: ../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 "نزّل معطيات خريطة من الخادم أو.أس.أم" -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -830,6 +850,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 "نسخة مطابقة" @@ -853,85 +873,91 @@ 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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "المساعدة على الخط لِـ ج.أو.أس.أم" -#: ../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 "" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -983,22 +1009,26 @@ 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 " @@ -1006,77 +1036,73 @@ msgstr "" -#: ../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 "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "غير قادر على تحريك الأغراض إلى خارج الدنيا" @@ -1084,5 +1110,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 "جديد" @@ -1092,17 +1118,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 "" +#: ../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 @@ -1140,21 +1171,17 @@ msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة" -#: ../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 "" -#: ../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 " @@ -1163,9 +1190,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 "إسقاط عمودي" @@ -1181,13 +1208,34 @@ 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 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1213,37 +1261,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 "" +#: ../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 "أعكس إتجاه الطرقات" @@ -1251,10 +1294,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 "إحفظ المعطيات الحالية." @@ -1265,35 +1309,25 @@ msgstr "" -#: ../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 " @@ -1301,28 +1335,28 @@ msgstr "" -#: ../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 "إحفظ ملف أو.أس.أم" -#: ../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 "إحفظ المعطيات الحالية في ملف جديد." @@ -1353,33 +1387,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." @@ -1391,5 +1425,5 @@ msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." -#: ../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 " @@ -1401,9 +1435,9 @@ msgstr[1] "" -#: ../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." @@ -1411,10 +1445,10 @@ msgstr[1] "" -#: ../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 " @@ -1422,5 +1456,5 @@ msgstr "" -#: ../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 " @@ -1428,5 +1462,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 " @@ -1434,8 +1468,31 @@ 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 +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 +msgid "Closing changeset" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1453,56 +1510,56 @@ msgstr "" +#: ../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:121 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java: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" +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: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 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../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" @@ -1512,9 +1569,9 @@ msgstr "" -#: ../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" @@ -1522,5 +1579,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" @@ -1564,61 +1621,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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "حمّل إلى أو.أس.أم ..." -#: ../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 "حمّل كل التغييرات إلى الخادم أو.أس.أم ." -#: ../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 "" -#: ../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 "" @@ -1632,17 +1699,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1653,32 +1720,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1686,31 +1791,91 @@ 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 +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] "الأغراض اللتي يجب إضافتها:" +msgstr[3] "الأغراض اللتي يجب إضافتها:" +msgstr[4] "الأغراض اللتي يجب إضافتها:" +msgstr[5] "الأغراض اللتي يجب إضافتها:" + +#: ../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] "الأغراض اللتي يجب تغييرها:" +msgstr[3] "الأغراض اللتي يجب تغييرها:" +msgstr[4] "الأغراض اللتي يجب تغييرها:" +msgstr[5] "الأغراض اللتي يجب تغييرها:" + +#: ../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] "الأغراض اللتي يجب حذفها:" +msgstr[3] "الأغراض اللتي يجب حذفها:" +msgstr[4] "الأغراض اللتي يجب حذفها:" +msgstr[5] "الأغراض اللتي يجب حذفها:" + +#: ../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 @@ -1734,20 +1899,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 "تقدّم سريع" @@ -1789,10 +1954,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 "تقدّم بطيء" @@ -1820,31 +1985,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 "" @@ -1856,20 +2017,20 @@ msgstr "" -#: ../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 @@ -1878,5 +2039,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 " @@ -1884,55 +2045,69 @@ msgstr "" -#: ../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 "" +#: ../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 @@ -1940,38 +2115,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." @@ -1980,14 +2155,14 @@ msgstr[1] "" -#: ../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 "إنهي الرسم." @@ -2007,5 +2182,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 "" @@ -2016,5 +2191,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 "" @@ -2030,17 +2205,18 @@ msgstr "" +#: ../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" @@ -2049,30 +2225,34 @@ msgstr[1] "" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." msgstr "" -#: ../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-" @@ -2095,60 +2275,60 @@ msgstr "" +#: ../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:77 +msgid "case sensitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 msgid "regular expression" msgstr "عبارة منتظمة" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"شارع الفران\" - 'شارع الفران' في أي مفتاح أو إسم." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +msgid "name:Bak - 'Bak' anywhere in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2156,109 +2336,110 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 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 "النوع: - نوع الغرض (عقدة, طريق, علاقة)" -#: ../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 "المستخدم:... - كلّ الأغراض اللتي قام المستخدم بتغييرها" +#: ../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 "العقد:... - الغرض ذات عدد العقد المحدد" -#: ../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 "مغيير - كلّ الأغراض المغييرة" -#: ../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 "المختارة - كلّ الأغراض المختارة" -#: ../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 "غير المكتملة - كلّ الأغراض غير المكتملة" -#: ../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:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "إستعمل | أو أو للدمج بالأو المنطقي" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2319,58 +2500,96 @@ msgstr "" -#: ../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 "لم أتمكن من القراءة من الــ URL: \"{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 "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" +#: ../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 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../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}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "آخر تغيير في {0}" + +#: ../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}''" -msgstr "" - -#: ../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 +#, 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: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" @@ -2380,10 +2599,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}" @@ -2395,5 +2614,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2402,10 +2621,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2414,5 +2633,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}''" @@ -2436,42 +2655,76 @@ 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}" +msgstr[3] "أمحي {0} {1}" +msgstr[4] "أمحي {0} {1}" +msgstr[5] "أمحي {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] "نمط المحو" +msgstr[3] "نمط المحو" +msgstr[4] "نمط المحو" +msgstr[5] "نمط المحو" + +#: ../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}" +msgstr[3] "أمحي {0} {1}" +msgstr[4] "أمحي {0} {1}" +msgstr[5] "أمحي {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] "أمحي من العلاقة" +msgstr[3] "أمحي من العلاقة" +msgstr[4] "أمحي من العلاقة" +msgstr[5] "أمحي من العلاقة" + +#: ../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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../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}\" في الدور {2}.\n" +"محو من العلاقة ؟" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "" @@ -2479,6 +2732,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." @@ -2487,5 +2740,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2496,5 +2749,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2529,10 +2782,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2545,18 +2808,38 @@ msgstr "التعاقب" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "حلّ {0} التناقضات في {1} أغراض" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "حلّ {0} التناقضات في {1} أغراض" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "حلّ {0} التناقضات في {1} أغراض" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../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} أغراض" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2580,13 +2863,13 @@ msgstr "" -#: ../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 "الدور الجديد" @@ -2605,62 +2888,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}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../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 +#, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" + +#: ../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 "" @@ -2674,29 +3014,36 @@ msgstr "" -#: ../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}" @@ -2708,15 +3055,229 @@ msgstr "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "لم أجد طريق \"من\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "لم أجد طريق \"إلى\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "" + +#: ../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" @@ -2729,22 +3290,7 @@ msgstr[5] "عقد" -#: ../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" @@ -2757,12 +3303,7 @@ msgstr[5] "طرقات" -#: ../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" @@ -2775,51 +3316,120 @@ msgstr[5] "علاقة" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} عضو" -msgstr[1] "{0} أعضاء" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 +#: ../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 "" + +#: ../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 "" + +#: ../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 "حزام لامبيرت (أستونيا)" + +#: ../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 "" + +#: ../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 from
''{0}''
Error was: {1}" +msgstr "" + +#: ../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/data/osm/Way.java:195 -#: build/trans_presets.java:3013 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 msgid "railway" msgstr "خط سكة حديد" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "مجرى مياه" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "إستعمال الأرض" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201 +#: ../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 @@ -2833,282 +3443,57 @@ msgstr[5] "{0} عقد" -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "لم أجد طريق \"من\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "لم أجد طريق \"إلى\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "حزام لامبيرت (أستونيا)" - -#: ../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 "" - -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} عضو" +msgstr[1] "{0} أعضاء" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "" @@ -3118,36 +3503,9 @@ msgstr "" -#: ../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 "" @@ -3157,9 +3515,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 "" @@ -3168,9 +3526,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3179,9 +3537,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 "" @@ -3191,9 +3560,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 "" @@ -3203,11 +3572,6 @@ msgstr "" -#: ../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 "" @@ -3225,38 +3589,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 "كلمة المرور أو.أس.أم." -#: ../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 " @@ -3264,5 +3628,5 @@ msgstr "" -#: ../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 " @@ -3270,5 +3634,5 @@ msgstr "" -#: ../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 " @@ -3276,75 +3640,94 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -3352,47 +3735,47 @@ msgstr "" -#: ../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 "" -#: ../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." msgstr "" -#: ../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 @@ -3404,21 +3787,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 "سمعيّ" @@ -3458,58 +3841,44 @@ 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:97 +msgid "The angle between the previous and the current way segment." +msgstr "" + +#: ../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:99 -msgid "The angle between the previous and the current way segment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 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 "" - -#: ../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 "" @@ -3521,10 +3890,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 @@ -3583,7 +3946,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" @@ -3599,5 +3961,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" @@ -3700,5 +4062,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 "" @@ -3709,5 +4071,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" @@ -3721,5 +4083,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 "" @@ -3794,6 +4156,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" @@ -3903,10 +4265,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 "" @@ -3915,19 +4277,19 @@ msgstr "" -#: ../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 "" @@ -3936,5 +4298,5 @@ msgstr "" -#: ../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 "" @@ -3952,9 +4314,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 " @@ -3962,110 +4324,112 @@ 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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4074,21 +4438,21 @@ msgstr "" -#: ../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 "" @@ -4127,10 +4491,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 @@ -4139,10 +4504,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 @@ -4156,5 +4522,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}" @@ -4196,435 +4562,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66 -msgid "Command Stack" -msgstr "تكدس الأوامر" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 -msgid "Open a list of all commands (undo buffer)." -msgstr "إفتح لائحة بكل الأوامر (مصد الإبطال)" - -#: ../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/SelectionListDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 -#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 -#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 -#: ../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 -#, java-format -msgid "Toggle: {0}" -msgstr "أقلب: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64 -#, java-format -msgid "Command Stack: {0}" -msgstr "تكدس الأوامر: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -msgid "Conflict" -msgstr "التناقض" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -msgid "Merging conflicts." -msgstr "دمج التناقضات." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 -msgid "Resolve" -msgstr "حلّ" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" - -#: ../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 -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 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 -#, java-format -msgid "" -"You didn''t finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " -"resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 -msgid "Conflict not resolved completely" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 -msgid "Resolve conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 -#, 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 -msgid "History" -msgstr "الخط الزمني" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 -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 "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 -#, java-format -msgid "index out of bounds Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 -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 "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 -msgid "Reload all currently selected objects and refresh the list." -msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة." - -#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 -msgid "Show" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 -msgid "Display the history of the selected primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -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 -msgid "Layers" -msgstr "الطبقات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 -msgid "Open a list of all loaded layers." -msgstr "إفتح لائحة بكلّ التبقات المحملة." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296 -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 "" - -#: ../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 -msgid "Show/Hide" -msgstr "عرض/إخفاء" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448 -msgid "Toggle visible state of the selected layer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 -msgid "Activate" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490 -msgid "Activate the selected layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545 -msgid "Merge this layer into another layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651 -msgid "Move the selected layer one row up." -msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670 -msgid "Move the selected layer one row down." -msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 -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 -#, java-format -msgid "This will change up to {0} object." -msgid_plural "This will change up to {0} objects." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 -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 -msgid "" -msgstr "<مختلف>" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356 -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 -#, java-format -msgid "Change properties of up to {0} object" -msgid_plural "Change properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 -msgid "Please select a key" -msgstr "الرجاء إختيار مفتاح" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344 -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 -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 -msgid "Properties/Memberships" -msgstr "خصائص/عضويات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468 -msgid "Properties for selected objects." -msgstr "خصائص الأغراض المختارة." - -#. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504 -msgid "Member Of" -msgstr "عضو من" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 -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 -#: ../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 -msgid "Add" -msgstr "أضِف" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590 -msgid "Add a new key/value pair to all objects" -msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 -msgid "Edit Properties" -msgstr "حرّر الخصائص" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596 -msgid "Edit the value of the selected key for all objects" -msgstr "حرّر المحتاح المنقى لكلّ الأغراض" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "الخصائص: {0} / العضويات: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811 -msgid "Properties / Memberships" -msgstr "الخصائص/ العضويات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 -msgid "Change relation" -msgstr "غيّر العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878 -msgid "Delete the selected key in all objects" -msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 -msgid "Delete Properties" -msgstr "أمحي الخصائص" - -#. item "Land use/Quarry" text "Name" -#. -#. -#: ../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 -msgid "Relations" -msgstr "العلاقات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 -msgid "Open a list of all relations." -msgstr "إفتح لائحة بكل العلاقات." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 -#, java-format -msgid "Relations: {0}" -msgstr "العلاقات: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265 -msgid "Open an editor for the selected relation" -msgstr "إفتح محرر نص للعلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306 -msgid "Delete the selected relation" -msgstr "أمحي العلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338 -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 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "الخيار الحالي" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "إفتح نافذة لائحة خيارات." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 -msgid "Refresh the selection list." -msgstr "إنعاش لائحة الخيارات." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159 -msgid "Zoom to selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" - -#: ../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/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "الخيار" - +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 +#, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 +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 @@ -4638,4 +4653,7 @@ msgstr[5] "{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 @@ -4645,4 +4663,428 @@ msgstr[1] "" +#: ../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} طرقات" +msgstr[3] "{0} طريق" +msgstr[4] "{0} طريق" +msgstr[5] "{0} طريق" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66 +msgid "Command Stack" +msgstr "تكدس الأوامر" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 +msgid "Open a list of all commands (undo buffer)." +msgstr "إفتح لائحة بكل الأوامر (مصد الإبطال)" + +#: ../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: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:67 +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 +#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 +#: ../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:73 +#, java-format +msgid "Toggle: {0}" +msgstr "أقلب: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64 +#, java-format +msgid "Command Stack: {0}" +msgstr "تكدس الأوامر: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +msgid "Conflict" +msgstr "التناقض" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +msgid "Merging conflicts." +msgstr "دمج التناقضات." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 +msgid "Resolve" +msgstr "حلّ" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" + +#: ../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: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:162 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../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:181 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 +#, java-format +msgid "" +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." +msgstr "" + +#: ../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:241 +msgid "Resolve conflicts" +msgstr "" + +#: ../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:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 +msgid "History" +msgstr "الخط الزمني" + +#: ../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:239 +#, java-format +msgid "index out of bounds Got {0}" +msgstr "" + +#: ../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 "" + +#: ../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: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:341 +msgid "Show" +msgstr "" + +#: ../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:87 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../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:148 +msgid "Open a list of all loaded layers." +msgstr "إفتح لائحة بكلّ التبقات المحملة." + +#: ../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:367 +msgid "Show/Hide" +msgstr "عرض/إخفاء" + +#: ../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:414 +msgid "Activate" +msgstr "" + +#: ../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:475 +msgid "Merge this layer into another layer" +msgstr "" + +#: ../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:600 +msgid "Move the selected layer one row down." +msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 +msgid "Information about layer" +msgstr "" + +#: ../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." +msgid_plural "This will change up to {0} objects." +msgstr[0] "" +msgstr[1] "" + +#: ../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: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:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +msgid "Change values?" +msgstr "غيّر القيم ؟" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#, java-format +msgid "Change properties of up to {0} object" +msgid_plural "Change properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../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:336 +msgid "Please select a value" +msgstr "الرجاء إختيار قيمة" + +#: ../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:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +msgid "Properties/Memberships" +msgstr "خصائص/عضويات" + +#: ../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:488 +msgid "Member Of" +msgstr "عضو من" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +msgid "Add Properties" +msgstr "أضف صفة" + +#: ../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:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65 +msgid "Add" +msgstr "أضِف" + +#: ../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:577 +msgid "Edit Properties" +msgstr "حرّر الخصائص" + +#: ../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:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "الخصائص: {0} / العضويات: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "الخصائص/ العضويات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +msgid "Change relation" +msgstr "غيّر العلاقة" + +#: ../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:855 +msgid "Delete the selected key in all objects" +msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete Properties" +msgstr "أمحي الخصائص" + +#. item "Land use/Quarry" text "Name" +#. +#. +#: ../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:71 +msgid "Open a list of all relations." +msgstr "إفتح لائحة بكل العلاقات." + +#: ../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:263 +msgid "Open an editor for the selected relation" +msgstr "إفتح محرر نص للعلاقة المحددة" + +#: ../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:336 +msgid "Create a new relation" +msgstr "أنشئ علاقة جديدة" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +msgid "Current Selection" +msgstr "الخيار الحالي" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 +msgid "Open a selection list window." +msgstr "إفتح نافذة لائحة خيارات." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 +msgid "Zoom to selected element(s)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +msgid "Refresh the selection list." +msgstr "إنعاش لائحة الخيارات." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159 +msgid "Zoom to selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#: ../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:346 #, java-format @@ -4650,78 +5092,109 @@ 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." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../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] "المؤلف" +msgstr[3] "المؤلف" +msgstr[4] "المؤلف" +msgstr[5] "المؤلف" + +#: ../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 +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 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "" @@ -4730,47 +5203,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 " @@ -4779,14 +5246,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 "" @@ -4796,9 +5263,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 "" @@ -4808,15 +5275,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4824,5 +5291,5 @@ msgstr "" -#: ../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 " @@ -4830,20 +5297,20 @@ msgstr "" -#: ../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 "" @@ -4852,57 +5319,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 " @@ -4911,9 +5378,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 "" @@ -4922,20 +5389,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 @@ -4945,37 +5408,37 @@ msgstr "مُوافق" -#: ../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 "" @@ -4985,30 +5448,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 "" @@ -5022,22 +5485,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 "" @@ -5070,34 +5538,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] "" -msgstr[1] "" - -#: ../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 "إختر أولاً إشارة مرجعية" @@ -5151,13 +5606,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 "غير قادر على قراءة نتائج بحث عن الإسم من الخادم" @@ -5165,18 +5620,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 "الإسم" @@ -5215,37 +5669,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: " @@ -5254,5 +5708,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 "خريطة زالقة" @@ -5279,46 +5733,74 @@ msgstr "أرقام البلاطة" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5637,14 +6119,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5820,8 +6316,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" #. @@ -5918,4 +6420,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6029,6 +6534,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 @@ -6036,153 +6541,171 @@ #: 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 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../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 @@ -6191,32 +6714,296 @@ msgstr "" -#: ../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 +#, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "" + +#: ../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] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../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] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../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 +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 +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 @@ -6224,29 +7011,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:587 +#, java-format +msgid "GPS start: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format -msgid "GPS start: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 -#, java-format msgid "GPS end: {0}" msgstr "" -#: ../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" @@ -6259,14 +7046,14 @@ msgstr[5] "صور" -#: ../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 @@ -6274,82 +7061,82 @@ msgstr "صور (*.jpg)JPEG" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -6409,5 +7196,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}" @@ -6423,10 +7210,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." @@ -6437,11 +7224,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 @@ -6481,4 +7268,9 @@ msgstr "" +#: ../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." @@ -6497,64 +7289,64 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -6566,5 +7358,5 @@ msgstr[5] "مسالك" -#: ../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" @@ -6576,5 +7368,5 @@ msgstr[5] "نقاط" -#: ../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" @@ -6583,5 +7375,5 @@ msgstr[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} consists of {1} track" @@ -6590,5 +7382,5 @@ msgstr[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" @@ -6601,9 +7393,9 @@ msgstr[5] "{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 "" -#: ../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" @@ -6615,5 +7407,5 @@ msgstr[5] "دالات" -#: ../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" @@ -6632,5 +7424,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}." @@ -6638,5 +7430,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 "" @@ -6664,5 +7456,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 " @@ -6670,5 +7462,5 @@ msgstr "" -#: ../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 " @@ -6676,29 +7468,29 @@ msgstr "" -#: ../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:43 +msgid "There was an error while trying to display the URL for this marker" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "There was an error while trying to display the URL for this marker" +msgid "(URL was: " msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 -msgid "(URL was: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../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 @@ -6706,26 +7498,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 @@ -6733,14 +7525,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 "أدخل زوج جديد مفتاح/قيمة" @@ -6863,40 +7655,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 "الألوان المستعملة في الأغراض المختلفة في ج.أو.أس.أم." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "الألوان" @@ -6940,5 +7732,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "السيارة" @@ -6960,16 +7752,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:" #. @@ -6999,12 +7792,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 "المشي" @@ -7176,5 +7969,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 "اعرض شاشة اللطخ عند بدء التشغيل" @@ -7182,23 +7975,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 "" -#: ../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 "" -#: ../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 "الشكل و المظهر" @@ -7230,54 +8034,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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 " @@ -7285,42 +8089,42 @@ 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 "تعيينات الإتصال للخادم أو.أس.أم." -#: ../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 "" "يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار." -#: ../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 "إسقاط الخريطة" @@ -7353,12 +8157,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 "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL الخادم الأساسي" #. 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 @@ -7385,61 +8181,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7605,36 +8400,59 @@ 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] "" +msgstr[1] "" + +#: ../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 "" -#: ../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 @@ -7642,15 +8460,15 @@ msgstr "" -#: ../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 @@ -7664,22 +8482,22 @@ msgstr[5] "غيّر {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}''" @@ -7718,11 +8536,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 " @@ -7730,38 +8548,38 @@ msgstr "" -#: ../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 "ملفات GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "وصف أثر جهاز تحديد المواقع العالمي" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "حقوق المؤلف (URL)" -#: ../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 "كلمات البحث" @@ -7771,9 +8589,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 "" @@ -7784,10 +8602,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 @@ -7797,12 +8615,12 @@ msgstr "" -#: ../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 "" -#: ../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" @@ -7823,6 +8641,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 @@ -7832,20 +8650,40 @@ msgstr "جاري تنزيل معطيات أو.أس.أم" -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 +#, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7853,34 +8691,34 @@ msgstr "" -#: ../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 "إحداثيات 0 " -#: ../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 !" @@ -7891,9 +8729,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7902,15 +8740,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7918,33 +8756,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." +msgstr "جاري تحضير المعطيات..." + +#: ../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 +#, java-format +msgid "Reusing existing changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +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 "آخر تغيير في {0}" + +#: ../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 "إتصل بــ {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, 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}." @@ -7972,42 +8867,50 @@ msgstr "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL الخادم الأساسي" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "كلمة المرور أو.أس.أم" -#: ../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." @@ -8016,20 +8919,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "ملفات الخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8038,5 +8941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8229,35 +9132,46 @@ msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت." -#: ../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 "" @@ -8267,5 +9181,5 @@ msgstr "" -#: ../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." @@ -8274,23 +9188,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8301,30 +9215,30 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8332,21 +9246,21 @@ msgstr "" +#: ../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:176 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 -msgid "Disable plugin" +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 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 " @@ -8354,5 +9268,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8360,19 +9274,19 @@ msgstr "" -#: ../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 "" -#: ../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." msgstr "" -#: ../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 " @@ -8380,13 +9294,13 @@ msgstr "" -#: ../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" @@ -8397,5 +9311,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" @@ -8404,18 +9318,18 @@ msgstr[1] "" -#: ../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 "" -#: ../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 "" @@ -8425,9 +9339,9 @@ msgstr "" -#: ../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 "" @@ -8437,35 +9351,35 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -8475,18 +9389,18 @@ msgstr "" -#: ../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 "دلّ على الخطوات اللتي أوصلتك إلى هذا الخطأ ( بطريقة مفصلة)" -#: ../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 " @@ -8494,19 +9408,19 @@ msgstr "" -#: ../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 "" -#: ../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 "" @@ -8515,5 +9429,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8522,5 +9436,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8530,5 +9444,5 @@ msgstr "" -#: ../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" @@ -8538,5 +9452,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8547,17 +9461,17 @@ "\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 "" @@ -8566,4 +9480,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8588,9 +9537,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 @@ -8598,27 +9565,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" +#: ../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}" @@ -8626,47 +9606,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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -8775,19 +9755,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 "" -#: ../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 "" -#: ../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." @@ -8796,34 +9776,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -8831,69 +9811,69 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8902,9 +9882,9 @@ msgstr "" -#: ../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 "" @@ -8913,65 +9893,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8979,13 +9959,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9006,5 +9986,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9017,12 +9997,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 "" @@ -9053,6 +10032,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9061,21 +10040,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" @@ -9084,37 +10063,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 "" -#: ../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." @@ -9126,18 +10116,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9145,5 +10135,5 @@ msgstr "" -#: ../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). " @@ -9151,39 +10141,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9239,7 +10229,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "جاري الإتصال بلخادم أو.أس.أم ..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 @@ -9277,20 +10266,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" @@ -9298,9 +10287,14 @@ 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 +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" @@ -9308,30 +10302,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "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 "إحداثيات 0 " +msgid "Set " +msgstr "إختر" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9393,6 +10396,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)" @@ -9414,6 +10417,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 "" @@ -9429,7 +10432,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 @@ -9949,6 +10952,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 "الماء" @@ -9960,8 +10963,4 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 msgid "land" -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" msgstr "" @@ -10245,9 +11244,9 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10256,5 +11255,5 @@ msgstr "" -#: ../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 "" @@ -10813,5 +11812,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 "إسم الشارع" @@ -10830,29 +11829,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 "عفواً، لا يعمل للمستخدمين مجهولي الهوية" @@ -10866,23 +11865,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 "" -#: ../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" @@ -10891,38 +11882,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10930,81 +11921,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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?" @@ -11014,25 +12005,25 @@ msgstr[1] "" -#: ../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 "" @@ -11119,53 +12110,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" @@ -11190,20 +12181,49 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +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 +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 +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 @@ -11286,23 +12306,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11311,7 +12331,7 @@ msgstr "" +#: ../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 "" @@ -11319,80 +12339,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11400,82 +12420,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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:711 +msgid "Check property values." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "" -#: ../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}''" @@ -11620,7 +12640,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 "" @@ -11634,5 +12654,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 "" @@ -11768,5 +12788,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11811,14 +12831,14 @@ msgstr "" -#: ../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}" @@ -11829,26 +12849,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 "" -#: ../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 "" -#: ../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 " @@ -11856,37 +12876,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -11899,104 +12937,141 @@ 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 "" -#: ../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 "" -#: ../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 +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" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "WMS URL (Default)" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../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 +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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12357,61 +13432,6 @@ #: 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 "" @@ -12427,5 +13447,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 "" @@ -12440,5 +13460,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" @@ -12448,10 +13467,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 "" @@ -12495,9 +13514,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 "" @@ -12545,13 +13564,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 "" @@ -12593,13 +13612,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 "" @@ -12639,12 +13658,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 "" @@ -12684,12 +13703,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 "" @@ -12845,17 +13864,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 "" @@ -12882,4 +13901,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" @@ -12898,11 +13918,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 "" @@ -12912,4 +13933,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" @@ -12924,9 +13946,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 "" @@ -12934,10 +13957,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" @@ -12945,11 +14031,92 @@ #: 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 +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 "" @@ -13031,20 +14198,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 "" @@ -13057,8 +14224,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 "" @@ -13093,32 +14260,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 "" @@ -13131,40 +14313,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 "" @@ -13177,19 +14359,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 "" @@ -13212,65 +14394,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13285,10 +14472,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 "" @@ -13304,17 +14491,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" @@ -13326,30 +14512,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 "" @@ -13357,25 +14543,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 "" @@ -13386,5 +14572,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 "" @@ -13400,5 +14586,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" #. @@ -13406,9 +14592,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 "النوع" @@ -13428,10 +14614,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 "" @@ -13453,10 +14639,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 "" @@ -13478,10 +14664,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 "" @@ -13503,5 +14689,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" @@ -13516,9 +14702,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 "" @@ -13532,9 +14718,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 "شارع سكني" @@ -13564,10 +14750,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 "" @@ -13597,6 +14783,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 "" @@ -13607,10 +14793,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 "حرّر خندق" @@ -13618,19 +14804,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 "" @@ -13646,5 +14832,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "" @@ -13653,5 +14839,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13659,5 +14845,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13665,5 +14851,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "" @@ -13673,11 +14859,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 "طريق قدم" @@ -13686,11 +14878,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 "المشاة" @@ -13699,5 +14897,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "حرّر شارع للمشاة" @@ -13705,5 +14903,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "درجات" @@ -13713,5 +14911,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 "" @@ -13720,5 +14918,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13727,39 +14925,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 "" @@ -13768,5 +14938,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13774,5 +14944,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13781,5 +14951,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13787,5 +14957,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13794,5 +14964,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13800,5 +14970,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13807,5 +14977,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13813,5 +14983,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13820,5 +14990,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13827,5 +14997,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "" @@ -13834,19 +15004,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 "" @@ -13856,5 +15029,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 "" @@ -13862,5 +15035,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -13870,5 +15043,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 "" @@ -13876,5 +15049,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -13884,5 +15057,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 "" @@ -13890,5 +15063,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -13898,5 +15071,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 "" @@ -13904,5 +15077,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -13912,5 +15085,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 "" @@ -13918,5 +15091,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -13926,5 +15099,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 "" @@ -13932,10 +15105,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 "تقاطع طرقات سريعة" @@ -13943,15 +15116,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 "الخدمات" @@ -13959,5 +15132,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "حرّر محطة خدمات" @@ -13971,4 +15144,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" #. @@ -13988,18 +15163,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 "شركة الإدارة" @@ -14008,5 +15185,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "إشارة سير" @@ -14016,5 +15193,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "نوع التقاطع للمشاة" @@ -14023,27 +15200,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 "" @@ -14051,6 +15228,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 "" @@ -14059,11 +15236,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 "" @@ -14071,30 +15248,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 "إشارة وقوف" @@ -14102,5 +15279,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "تقاطع مشاة" @@ -14109,14 +15286,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "مستديرة صغيرة" @@ -14127,14 +15304,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 "" @@ -14144,20 +15321,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 "كاميرا مراقبة السير" @@ -14165,5 +15342,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "هاتف طوارئ" @@ -14171,5 +15348,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14177,5 +15354,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14184,10 +15361,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 "" @@ -14195,5 +15372,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14201,5 +15378,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14207,11 +15384,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 "إرتفاع" @@ -14219,5 +15396,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "حواجز" @@ -14225,5 +15402,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14231,5 +15408,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14274,16 +15451,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 "حاجز دراجة" @@ -14292,5 +15469,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14298,5 +15475,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14304,10 +15481,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 "" @@ -14315,15 +15492,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 "" @@ -14331,5 +15508,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "" @@ -14337,10 +15514,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 "حرّر مراقبة الحدود" @@ -14350,5 +15527,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14357,5 +15534,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14364,5 +15541,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "حائط/جدار" @@ -14370,5 +15547,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "حائط/جدار مدينة" @@ -14377,5 +15554,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14387,15 +15564,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 "" @@ -14403,50 +15580,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 "" @@ -14454,25 +15631,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 "" @@ -14483,10 +15660,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 "نبع" @@ -14494,5 +15671,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "حرّر نبع" @@ -14500,5 +15677,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "مسرب" @@ -14506,10 +15683,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 "جدول نهر" @@ -14517,10 +15694,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 "قناة" @@ -14528,10 +15705,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 "نهر" @@ -14541,5 +15718,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 "نهر" @@ -14547,15 +15724,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 "حرّر الأرض اليابسة" @@ -14563,15 +15740,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 "خزان" @@ -14579,15 +15756,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 "حرّر خزان مغطى" @@ -14595,5 +15772,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "ضفة نهر" @@ -14602,10 +15779,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 "أراضي رطبة" @@ -14616,14 +15793,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 "" @@ -14637,35 +15814,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 "شاطئ بحر" @@ -14673,20 +15850,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 "منحدر صخري" @@ -14694,10 +15871,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 "شاطئ" @@ -14705,5 +15882,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "حرّر شاطئ" @@ -14711,5 +15888,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "" @@ -14717,5 +15894,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14724,5 +15901,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "حوض سفن" @@ -14730,10 +15907,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 "مرسى" @@ -14741,5 +15918,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "حرّر مرسى" @@ -14747,5 +15924,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "سدّ" @@ -14753,15 +15930,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 "" @@ -14770,5 +15947,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "سدّ (صغير)" @@ -14776,20 +15953,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 "" @@ -14798,15 +15975,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 "رصيف ميناء" @@ -14814,10 +15991,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 "" @@ -14825,10 +16002,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 "" @@ -14838,5 +16015,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 "" @@ -14844,10 +16021,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 "سكة" @@ -14855,5 +16032,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "حرّر سكة" @@ -14883,8 +16060,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 "" @@ -14898,35 +16075,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 "قطار ذات سكة حديد واحدة" @@ -14934,45 +16111,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 "" @@ -14980,5 +16157,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -14987,14 +16164,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 "سكة حديد مهجورة" @@ -15003,5 +16180,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15010,5 +16187,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15018,5 +16195,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15024,5 +16201,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15031,10 +16208,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 "مصعد كرسي" @@ -15042,10 +16219,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 "" @@ -15053,10 +16230,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 "" @@ -15064,10 +16241,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 "" @@ -15075,5 +16252,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15081,5 +16258,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 "محطة" @@ -15090,10 +16267,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 "وقود" @@ -15103,9 +16280,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" @@ -15125,106 +16531,138 @@ #. -#: 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 +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 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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 "حرر إستأجار دراجة" @@ -15233,15 +16671,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 "" @@ -15249,5 +16687,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "موقف قطار" @@ -15255,5 +16693,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "حرّر موقف" @@ -15261,5 +16699,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "موقف ترام" @@ -15268,5 +16706,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "حرر موقف ترام" @@ -15274,5 +16712,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "رصيف محطة القطار" @@ -15281,5 +16719,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "حرّر رصيف محطة القطار" @@ -15291,5 +16729,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 "" @@ -15297,10 +16735,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 "مدخل قطار نفقي" @@ -15309,10 +16747,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 "مناسب لكرسي المقعدين" @@ -15321,5 +16759,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "محطة حافلة نقل جماعي (باص)" @@ -15328,5 +16766,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "حرّر محطة حافلة نقل جماعي (باص)" @@ -15334,5 +16772,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "موقف محطة حافلة نقل جماعي" @@ -15342,5 +16780,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 "حرّر موقفحافلة نقل جماعي (باص)" @@ -15349,8 +16787,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 "ملجأ" @@ -15358,10 +16794,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 "" @@ -15369,5 +16805,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "تاكسي" @@ -15375,5 +16811,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "حرّر موقف تاكسي" @@ -15381,5 +16817,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "مطار" @@ -15387,15 +16823,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 "" @@ -15404,5 +16840,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "مكان المبيت" @@ -15414,5 +16850,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "فندق" @@ -15421,15 +16857,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 "فندق (رخيص)" @@ -15437,20 +16873,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 "كوخ" @@ -15458,10 +16894,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 "نزل" @@ -15469,30 +16905,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 "موقع تخييم" @@ -15500,10 +16936,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 "طعام و شراب" @@ -15514,5 +16950,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "مطعم" @@ -15520,5 +16956,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "حرّر مطعم" @@ -15526,5 +16962,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 "الطبخ" @@ -15532,61 +16968,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 "وجبات سريعة" @@ -15594,9 +17030,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 "مقهى إستراحة" @@ -15604,10 +17040,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 "حانة" @@ -15615,20 +17050,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 "حانة" @@ -15636,10 +17069,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 "نادي سهر / نادي ليلي" @@ -15647,33 +17079,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 "متحف" @@ -15681,10 +17104,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 "حديقة حيوانات" @@ -15693,10 +17115,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 "موقع كاشف" @@ -15704,25 +17125,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 "أعمال فنية" @@ -15730,5 +17150,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "حرّر أعمال فنية" @@ -15736,86 +17156,210 @@ #. 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 "مدينة" + +#: 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)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. 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 "حرّر ملجأ" @@ -15823,25 +17367,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 "قلعة" @@ -15850,20 +17394,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 "موقع أثري" @@ -15872,10 +17415,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 "ساحة معركة" @@ -15883,5 +17425,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "حرّر ساحة معركة" @@ -15889,15 +17431,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 "نصب تذكاري" @@ -15905,45 +17447,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 "ملعب" @@ -15951,15 +17493,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 "حرّر صيد السمك" @@ -15967,15 +17509,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 "حرّر مدرج ألعاب رياضية" @@ -15989,6 +17531,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 "إختر الرياضة :" @@ -16380,30 +17922,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 "الرياضة" @@ -16413,227 +17955,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 "" @@ -16672,248 +18212,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "رماية" @@ -16921,178 +18453,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 "مبنى" @@ -17100,5 +18632,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "مبنى عام" @@ -17106,10 +18638,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 "مبنى البلدية" @@ -17117,10 +18649,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 "سفارة" @@ -17128,10 +18660,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 "محكمة" @@ -17140,10 +18672,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 "سجن" @@ -17152,10 +18684,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 "شرطة" @@ -17165,10 +18697,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 "فوج إطفاء" @@ -17177,10 +18709,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 "مكتب البريد" @@ -17188,5 +18720,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "حرّر مكتب البريد" @@ -17194,15 +18726,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 "مدرسة" @@ -17210,10 +18742,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 "جامعة" @@ -17221,10 +18753,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 "كلّية" @@ -17232,5 +18764,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "حرّر كلّية" @@ -17238,5 +18770,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "سينما" @@ -17245,10 +18777,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 "مكتبة" @@ -17257,10 +18789,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 "مركز ثقافي" @@ -17268,10 +18799,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 "مسرح" @@ -17280,10 +18811,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 "معبد" @@ -17293,5 +18824,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 "حرّر معبد" @@ -17300,6 +18831,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 "الديانة" @@ -17308,66 +18839,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 "الطقوس الدينية" @@ -17376,81 +18907,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 "عناوين" @@ -17459,5 +18990,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "حرّر معلومات عنوان" @@ -17465,5 +18996,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "رقم المنزل" @@ -17471,20 +19002,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 "رمز البلد" @@ -17492,5 +19023,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "إستيفاء العنوان" @@ -17499,5 +19030,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "حرّر إستيفاء العنوان" @@ -17505,71 +19036,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 "منارة" @@ -17577,10 +19104,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 "طاحونة هوائية" @@ -17588,10 +19115,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 "خط أنابيب" @@ -17599,10 +19126,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 "محطّة تكرير مياه" @@ -17612,10 +19139,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 "ونش" @@ -17623,10 +19150,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 "عمود إضائة" @@ -17634,10 +19161,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 "نقطة رؤية" @@ -17645,10 +19172,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 "مراقبة" @@ -17656,5 +19183,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "حرّر كامرة مراقبة" @@ -17662,5 +19189,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "مولد طاقة" @@ -17670,39 +19197,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 "محطة توليد طاقة" @@ -17711,10 +19238,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 "محطة طاقة فرعية" @@ -17723,5 +19250,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "حرّر محطة طاقة فرعية" @@ -17729,10 +19256,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 "عمود كهربائي" @@ -17743,5 +19270,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 "حرّر عمود كهربائي" @@ -17749,5 +19276,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "سلك/خط كهربائي" @@ -17756,46 +19283,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 "هاتف" @@ -17804,5 +19325,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "حرّر هاتف" @@ -17810,5 +19331,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 "عملات معدنية" @@ -17816,5 +19337,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 "الملاحظات" @@ -17822,5 +19343,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 "" @@ -17828,5 +19349,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 "" @@ -17834,15 +19355,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 "إعادة تصنيع الأشياء" @@ -17851,5 +19372,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "حرّر إعادة تصنيع الأشياء" @@ -17857,80 +19378,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 "نافورة" @@ -17939,10 +19456,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 "ماء شفة" @@ -17951,10 +19468,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 "" @@ -17962,25 +19479,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 "" @@ -17988,10 +19515,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 "كشك" @@ -17999,10 +19525,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 "آلة بيع" @@ -18010,5 +19555,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "" @@ -18016,88 +19561,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 "جزار" @@ -18105,10 +19650,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 "خباز" @@ -18116,10 +19660,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 "بائع الزهور" @@ -18127,20 +19670,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 "" @@ -18148,60 +19689,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 "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "حرّر مبيع Hifi" -#. 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 "" @@ -18209,10 +19744,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 "خردوات/أدوات منزلية" @@ -18220,10 +19754,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 "" @@ -18231,60 +19764,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 "تنظيف جاف" @@ -18292,10 +19819,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 "مصبغة/غسيل" @@ -18303,10 +19829,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 "نشاطات في الخلاء" @@ -18314,35 +19839,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 "مصرف" @@ -18350,16 +19872,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 "صرّاف" @@ -18367,5 +19887,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "حرّر صرّاف" @@ -18373,15 +19893,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 "أطباء" @@ -18389,20 +19909,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 "صيدلية" @@ -18410,5 +19928,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "حرّر صيدلية" @@ -18416,10 +19934,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 "مستشفى" @@ -18427,10 +19944,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 "نقطة دخول طوارئ" @@ -18439,5 +19956,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "حرّر نقطة دخول طوارئ" @@ -18446,20 +19963,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" @@ -18467,5 +19984,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 "بيطري" @@ -18474,55 +19991,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 "" @@ -18530,15 +20047,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "مدينة" #. 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 "بلدة" @@ -18546,10 +20063,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 "ضاحية" @@ -18557,25 +20074,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 "حرّر قرية صغيرة" @@ -18583,5 +20100,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "محلة" @@ -18589,10 +20106,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 "جزيرة" @@ -18600,11 +20117,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 "مدخل كهف" @@ -18612,10 +20142,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 "قمّة" @@ -18623,10 +20153,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 "جليد" @@ -18634,10 +20164,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 "بركان" @@ -18645,70 +20175,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 "شجرة" @@ -18717,15 +20247,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 "حرج" @@ -18734,5 +20264,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "حرّر حرج" @@ -18740,17 +20270,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 "غابة" @@ -18759,14 +20289,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 "حرّر محمية طبيعية" @@ -18774,25 +20304,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 "" @@ -18800,10 +20330,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 "" @@ -18811,5 +20341,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "حرّر أرض بور" @@ -18817,5 +20347,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "فناء مزرعة" @@ -18824,45 +20354,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 "حرّر حصص سكنية" @@ -18870,25 +20400,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 "" @@ -18896,10 +20426,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 "شائع" @@ -18907,20 +20437,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 "ميدان ألعاب" @@ -18928,5 +20458,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "حرّر ميدان ألعاب" @@ -18934,15 +20464,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 "مقبرة" @@ -18950,9 +20480,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 "مقبرة" @@ -18960,39 +20490,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 "أرض سكة حديد" @@ -19000,15 +20530,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 "حرّر الإستخدام العسكري للأرض" @@ -19016,55 +20546,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 "متعدد الضلوع" @@ -19074,5 +20604,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 "حرّر متعدد الضلوع" @@ -19081,10 +20611,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 "حرّر الفلق الخارجي" @@ -19092,5 +20622,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "حصر الإنعطاف" @@ -19099,5 +20629,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "حرّر حصر الإنعطاف" @@ -19105,34 +20635,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 "على_الطول_فقط" @@ -19141,15 +20671,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 "إلى الطريق" @@ -19157,5 +20687,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "الطريق" @@ -19164,5 +20694,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "حرّر طريق" @@ -19170,5 +20700,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "نوع الطريق" @@ -19240,5 +20770,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 @@ -19247,17 +20777,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 "" @@ -19310,5 +20840,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 @@ -19317,13 +20847,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 "" @@ -19337,10 +20867,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 "وصف الرمز" @@ -19348,31 +20878,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)" @@ -19381,30 +20911,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 "نقطة التوقف الخلفية" @@ -19842,11 +21372,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 "مهجور" @@ -20172,41 +21702,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 @@ -21907,5 +23400,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 "" @@ -22504,55 +23997,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22566,5 +24010,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 "سياحة" @@ -22636,8 +24080,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 "تاريخي" @@ -22708,8 +24152,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 "خضار" @@ -22723,5 +24167,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "كسارة / مقلع حجارة" @@ -22735,5 +24179,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22755,5 +24199,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "حوض" @@ -22767,5 +24211,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "غابة" @@ -22779,5 +24223,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "فناء مزرعة" @@ -22800,5 +24244,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "بيع بلمفرق" @@ -22812,5 +24256,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "صناعي" @@ -22824,5 +24268,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22836,5 +24280,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "حقل خضار" @@ -22848,5 +24292,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -22903,7 +24347,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 "عسكري" @@ -22917,5 +24361,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "مقبرة/جبانة" @@ -22928,5 +24372,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "قمّة" @@ -22941,5 +24385,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "نهر الجليد" @@ -22953,5 +24397,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "بركان" @@ -23006,8 +24450,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 "طبيعي" @@ -23021,5 +24465,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "أشجار منخفضة" @@ -23033,20 +24477,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 @@ -23057,5 +24489,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "طين" @@ -23069,5 +24501,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "شاطئ" @@ -23145,8 +24577,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 "طريق" @@ -23194,7 +24626,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 "الحدود" @@ -23336,10 +24768,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 "المكان" @@ -23387,6 +24828,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 "العنوان" @@ -23683,4 +25124,43 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم." + +#~ msgid "No document open so nothing to save." +#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." + +#~ msgid "Delete {1} {0}" +#~ msgstr "أمحي {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" + +#~ msgid "Delete Layer" +#~ msgstr "أمحي الطبقة" + +#~ msgid "Authors: {0}" +#~ msgstr "المؤلفون: {0}" + +#~ msgid "Edit Information Office" +#~ msgstr "حرّر مكتب إستعلامات" + +#~ msgid "Map Type" +#~ msgstr "نوع الخريطة" + +#~ msgid "map" +#~ msgstr "خريطة" + +#~ msgid "citymap" +#~ msgstr "خريطة المدينة" + +#~ msgid "bicyclemap" +#~ msgstr "خريطة راكب دراجة" + +#~ msgid "Board Type" +#~ msgstr "نوع اللوحة" + +#~ msgid "board" +#~ msgstr "اللوح" + #~ msgid "Aborting..." #~ msgstr "إجهاض..." @@ -23743,7 +25223,4 @@ #~ msgstr "غير قادر على الإتصال بلمخدم." -#~ msgid "Not implemented yet." -#~ msgstr "لمّا مفعّل." - #~ msgid "Occupied By" #~ msgstr "المشغول من" @@ -23787,7 +25264,4 @@ #~ msgid "Relation Editor: {0}" #~ msgstr "محرّر العلاقات: {0}" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "حلّ {0} التناقضات في {1} أغراض" #~ msgid "position" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 17484) +++ /applications/editors/josm/i18n/po/bg.po (revision 17485) @@ -8,6 +8,6 @@ "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 05:50+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-05 12:00+0000\n" "Last-Translator: pl71 \n" "Language-Team: Bulgarian \n" @@ -16,21 +16,21 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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" @@ -38,56 +38,59 @@ "Проекцията {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 @@ -97,154 +100,161 @@ #: ../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] "Има несъхранени промени. Да ги отхвърлим ли за да продължим?" + +#: ../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 @@ -269,7 +279,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" @@ -307,5 +318,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" @@ -329,6 +340,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 "Разширения" @@ -343,8 +354,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. Пренасочването към " @@ -352,9 +363,19 @@ "\"{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 "Моля, изберете поне една качена вече точка, линия или връзка." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -365,5 +386,5 @@ "всичките {1} избрани примитиви." -#: ../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 "Моля, изберете слой за целта" @@ -373,11 +394,11 @@ msgstr "Изберете целеви слой" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -388,5 +409,5 @@ "обедини." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Няма слоеве за целта" @@ -403,11 +424,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 @@ -436,5 +457,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 "Географска ширина:" @@ -443,30 +464,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 @@ -480,6 +501,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 @@ -487,58 +508,57 @@ 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 "" @@ -549,10 +569,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 "" @@ -563,5 +583,5 @@ "примитив {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -572,46 +592,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 @@ -621,22 +641,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 "Моля, изберете поне две линии за комбиниране." @@ -647,4 +667,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 " @@ -654,19 +678,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 @@ -674,27 +686,34 @@ 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 " @@ -704,32 +723,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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -739,20 +758,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 "Изтриване" @@ -762,86 +781,87 @@ 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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -850,6 +870,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,81 +894,87 @@ 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 "Експорт в GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../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." @@ -956,5 +982,5 @@ "Страницата с помощ липсва. Създайте я на английски." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1008,34 +1034,34 @@ 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 " "to merge them?" msgstr "" -"Избраните точки участват в различни релации. Все пак искате ли да ги " -"обедините?" - -#: ../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 "" @@ -1043,69 +1069,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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Невъзможно да се премества обектите извън границите на света." @@ -1113,5 +1139,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 "Нов" @@ -1121,18 +1147,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 @@ -1171,22 +1201,18 @@ "Преместване на точките, така че аглите между линиите да са 90 или 270 градуса" -#: ../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 "" "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." -#: ../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 " @@ -1194,10 +1220,13 @@ "projection to get rid of this warning.
Do you want to continue?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +"Вие използвате проекцията EPSG:4326, която може да доведе
до " +"нежелани резултати при правоъгълни подравнявания.
Сменете проекцията за " +"избягване на това предупреждение.
Ще продължите ли?" + +#: ../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 "Ортогонализиране" @@ -1213,13 +1242,26 @@ 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}" + +#: ../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} примитива." #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1245,37 +1287,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 "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}" - -#: ../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 "Промяна посоката на линиите" @@ -1283,10 +1320,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 "Запазване на текущите данни." @@ -1297,37 +1335,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 " @@ -1337,28 +1363,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 "Записване на текущите данни в нов файл." @@ -1393,33 +1419,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 +msgstr "Копиране в клипборда и затваряне" + +#: ../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." @@ -1427,5 +1453,5 @@ msgstr[1] "Избраните точки не са в средата на път." -#: ../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 " @@ -1441,9 +1467,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." @@ -1451,6 +1477,6 @@ msgstr[1] "Избраният път не съдържа избраните точки" -#: ../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 "" @@ -1458,5 +1484,5 @@ "път." -#: ../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 " @@ -1466,5 +1492,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 " @@ -1472,5 +1498,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 " @@ -1478,8 +1504,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 @@ -1497,53 +1548,53 @@ 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 "" -"* Една точка, която се използва от няколко линии и една от тези линии, или" +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: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 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1552,5 +1603,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" @@ -1563,9 +1614,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" @@ -1573,5 +1624,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" @@ -1616,61 +1667,71 @@ "Обновяване на текущия слой с данни от сървъра (презареждане на данните)" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Не е намерен примитив с id {0} в текущия набор от данни" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../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 "" @@ -1684,17 +1745,17 @@ msgstr "" -#: ../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 "" @@ -1704,6 +1765,11 @@ "{1} to abort and continue editing.
" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 +"Качването неуспешно защото сървърът има по-нова " +"версия
на някой от вашите възли, пътища, или отношения.

Кликнете " +"{0} за да синхронизирате цялата база данни със сървъра." +"
Кликнете {1} за отказ и продължаване на редакциите." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1712,5 +1778,5 @@ "\"!" -#: ../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}\"" @@ -1719,22 +1785,60 @@ "\"{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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1744,31 +1848,80 @@ "на заявка за всяка променена примитива" -#: ../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] "Обекти за добавяне:" + +#: ../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] "Променени обекти:" + +#: ../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] "Обекти за изтриване:" + +#: ../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 @@ -1792,20 +1945,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 "По-бързо възпроизвеждане." @@ -1847,10 +2000,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 "По-бавно възпроизвеждане" @@ -1879,31 +2032,27 @@ "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}" -#: ../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 "Следните грешки се получиха по време на масовото сваляне:{0}" -#: ../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 "" @@ -1915,20 +2064,20 @@ msgstr "" -#: ../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 @@ -1937,5 +2086,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 " @@ -1946,55 +2095,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}'' не трябва да е празен" +#: ../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 @@ -2002,38 +2165,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." @@ -2042,14 +2205,14 @@ msgstr[1] "Вмъкване на нов възел в {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 "Завършване на чертането." @@ -2069,5 +2232,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 "Отпуснете бутона на мишката за да изберете обектите в правоъгълника." @@ -2079,5 +2242,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 "Отпуснете бутона на мишката за да спрете въртенето." @@ -2096,17 +2259,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" @@ -2115,13 +2279,21 @@ msgstr[1] "Добавяне и преместване на виртуален нов възел към {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 "" @@ -2130,13 +2302,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." @@ -2145,5 +2313,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-" @@ -2171,60 +2339,60 @@ "десния бутон на мишката" +#: ../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, " @@ -2234,67 +2402,66 @@ "*=value, 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: - ключ=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:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "тип: - тип на обекта (възел, път, връзка)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - пит на обекта (node - точка / възел, way - " -"линия / път, relation - релация)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - всички обекти, променени от зададения потребител" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java: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 "untagged - всички немаркирани обекти" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent израз - все предки объектов, соответствующие выражению" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent израз - все предки объектов, соответствующие выражению" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2302,46 +2469,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" @@ -2374,6 +2541,6 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -"Непознат тип на примитив: {0}. Позволените стойности са: точка, път или " -"отношение." +"Непознат тип на примитив: {0}. Позволените стойности са: възел, път или " +"връзка." #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 @@ -2410,58 +2577,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 "Грешка при четене от адрес URL: \"{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 "Грешка на разбор от URL: \"{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}" -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/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}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Списък с промени {0}" + +#: ../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" @@ -2470,10 +2675,10 @@ msgstr[1] "обекти" -#: ../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}" @@ -2485,5 +2690,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 "" @@ -2491,11 +2696,13 @@ "conflict can't be added." msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180 +"Слой ''{0}'' вече има конфликт за примитива
''{1}''.
Този " +"конфликт не може да бъде прибавен." + +#: ../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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2506,5 +2713,5 @@ "примитив ''{1}''" -#: ../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}''" @@ -2516,4 +2723,6 @@ msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" msgstr "" +"Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " +"наличен вече" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2529,44 +2738,60 @@ "невъзможно е разрешаването на конфликт, за който няма предложено решение." -#: ../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}" + +#: ../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] "Режим на изтриване" + +#: ../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}" + +#: ../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] "Изтриване от връзка" + +#: ../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?" -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 +#: ../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:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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: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 "Разделяне пътен сегмент" @@ -2574,6 +2799,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." @@ -2585,5 +2810,5 @@ "не виждате) може да ги използват.
Наистина ли искате да ги триете?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Потвърждение за изтриване" @@ -2592,7 +2817,7 @@ #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgstr "Разрешаване на конфликтите в изтрито състояние в {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2622,17 +2847,27 @@ #, java-format msgid "removing reference from relation {0}" -msgstr "" +msgstr "Премахване на отношението от връзката {0}" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +msgstr "Разрешаване на конфликтите в списъка с членове на връзката {0}" + +#: ../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" @@ -2645,28 +2880,48 @@ msgstr "Последователност" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../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/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}" -msgstr "" +#: ../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}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format msgid "Resolve conflicts in node list of of way {0}" -msgstr "" +msgstr "Разрешаване конфликтите в списъка от връзки на път {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 #, java-format msgid "Main dataset does not include node {0}" -msgstr "" +msgstr "Главната база данни не съдържа възела {0}" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -2682,13 +2937,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 "Нова роля" @@ -2707,62 +2962,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 "" @@ -2770,4 +3082,6 @@ "{1}" msgstr "" +"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със " +"сигурността. Изключение на ОС: {1}" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 @@ -2776,32 +3090,39 @@ 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}" -msgstr "" +msgstr "Списък с промени {0}" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 @@ -2810,15 +3131,229 @@ 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 "" + +#: ../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 "" + +#: ../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 "Повече от един път \"от\" са намерени." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Повече от един път \"до\" са намерени." + +#: ../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 "Повече от един \"през\" са открити." + +#: ../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 "Не е намерен път \"от\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Не е намерен път \"до\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Не е открит възел или път \"през\"." + +#: ../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 "Пътят \"от\" не започва или не завършва във възел \"през\"." + +#: ../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 "Пътят \"до\" не започва или свършва във възел \"през\"." + +#: ../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 "Пътят \"от\" не започва или свършва във възел \"през\"." + +#: ../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 "Пътят \"до\" не започва или свършва в път \"през\"." + +#: ../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 "" + +#: ../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" @@ -2827,22 +3362,7 @@ msgstr[1] "възли" -#: ../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" @@ -2851,259 +3371,12 @@ msgstr[1] "пътища" -#: ../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" msgid_plural "relations" -msgstr[0] "релация" -msgstr[1] "релации" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} член" -msgstr[1] "{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} точки" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "Повече от един път \"от\" са намерени." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Повече от един път \"до\" са намерени." - -#: ../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 "Повече от един \"през\" са открити." - -#: ../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 "Не е намерен път \"от\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Не е намерен път \"до\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Не е открит възел или път \"през\"." - -#: ../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 "Пътят \"от\" не започва или не завършва във възел \"през\"." - -#: ../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 "Пътят \"до\" не започва или свършва във възел \"през\"." - -#: ../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 "Пътят \"от\" не започва или свършва във възел \"през\"." - -#: ../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 "Пътят \"до\" не започва или свършва в път \"през\"." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "неактивен" +msgstr[0] "връзка" +msgstr[1] "връзки" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 @@ -3117,5 +3390,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "фон" @@ -3125,13 +3398,13 @@ msgstr "подчертай" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" -msgstr "" +msgstr "WGS84 Geographic" #: ../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 +msgstr "Gauss-Laborde Réunion 1947" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3148,61 +3421,147 @@ "започнете нов слой в новата зона." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Ламбертова зона (Франция)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Ламбертова Зона (Естония)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Проекция Меркатор" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Швейцарска Мрежа (Швейцария)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" -msgstr "" +msgstr "UTM Зона {0}" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "UTM20N Guadeloupe Ste-Anne 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "" +msgstr "UTM20N Martinique Fort Desaix 1952" #: ../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 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Отметките не могат да бъдат прочетени.
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "Отметката не може да бъде записана.
{0}" #: ../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/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/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} точки" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} член" +msgstr[1] "{0} членове" + +#: ../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 на сървъра в настройките и Вашата интернет връзка." -#: ../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 "" @@ -3212,36 +3571,9 @@ msgstr "" -#: ../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 "" @@ -3251,9 +3583,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 +msgstr "Изключение свързано със сигурността" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3262,9 +3594,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +msgstr "Изключение свързано с мрежата" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3273,9 +3605,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 +msgstr "Входно-изходно изключение" + +#: ../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 "" @@ -3285,9 +3628,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 "" @@ -3300,12 +3643,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 @@ -3322,38 +3660,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 " @@ -3363,5 +3701,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 " @@ -3371,5 +3709,5 @@ "съдържаща 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 " @@ -3379,75 +3717,94 @@ "URL препратка, връщаща 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" @@ -3457,47 +3814,47 @@ "че зареждате данни преди --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 +msgstr "Настройки по подразбиране" + +#: ../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." msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../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 @@ -3509,21 +3866,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 "Аудио" @@ -3563,59 +3920,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 @@ -3626,10 +3969,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 @@ -3668,5 +4005,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22 msgid "My with Merged" -msgstr "Моя с Обедининия" +msgstr "Моята версия с Обединената" #. * @@ -3675,5 +4012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27 msgid "Their with Merged" -msgstr "Тчхния с Обединения" +msgstr "Тяхната версия с Обединената" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82 @@ -3689,7 +4026,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" @@ -3705,5 +4041,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" @@ -3743,5 +4079,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" -msgstr "" +msgstr "Членове (разрешени)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 @@ -3753,5 +4089,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" -msgstr "" +msgstr "Членове (с конфликти)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 @@ -3761,17 +4097,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" -msgstr "" +msgstr "Няма чакащи конфликти на характеристиките" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" -msgstr "" +msgstr "Характеристики (с конфликти)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "Чакащи за разрешаване конфликти на характеристики" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 msgid "Conflict Resolution" -msgstr "" +msgstr "Разрешение на конфликт" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 @@ -3790,23 +4126,23 @@ #, java-format msgid "unexpected value of parameter \"index\". Got {0}" -msgstr "" +msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 #, java-format msgid "item {0} not found in list" -msgstr "" +msgstr "точка {0} не е открита в списъка" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 msgid "lock scrolling" -msgstr "" +msgstr "заключване на скролирането" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 msgid "Compare " -msgstr "" +msgstr "Сравняване " #: ../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 "" +msgstr "Моя версия" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 @@ -3815,8 +4151,8 @@ #: ../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" -msgstr "" +msgstr "Обединена версия" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 @@ -3825,9 +4161,11 @@ "decisions are applied." msgstr "" +"Списък на обединените елементи. Те ще заместят моите елементи, когато се " +"приложат решенията за обединяване." #: ../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 "" +msgstr "Тяхна версия" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 @@ -3837,5 +4175,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 msgid "> top" -msgstr "" +msgstr "> горе" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 @@ -3845,5 +4183,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 msgid "> bottom" -msgstr "" +msgstr "> долу" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 @@ -3885,21 +4223,21 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 msgid "Up" -msgstr "" +msgstr "Нагоре" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "" +msgstr "Преместване нагоре на избраните елементи с една позиция" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 msgid "Down" -msgstr "" +msgstr "Надолу" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 msgid "Move down the selected entries by one position" -msgstr "" +msgstr "Преместване на избраните елементи надолу с една позиция" #: ../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" @@ -3913,18 +4251,19 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 msgid "Freeze" -msgstr "" +msgstr "Фиксиране" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 msgid "Freeze the current list of merged elements" -msgstr "" +msgstr "Фиксиране на текущия списък обединени елементи" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 msgid "Unfreeze" -msgstr "" +msgstr "Освобождаване" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 msgid "Unfreeze the list of merged elements and start merging" msgstr "" +"Освобождаване на списъка обединени елементи и стартиране на обединяването" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 @@ -3984,5 +4323,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" -msgstr "" +msgstr "параметърът '{0}' не трябва да е празен" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4002,5 +4341,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27 msgid "Node" -msgstr "" +msgstr "Възел" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 @@ -4009,10 +4348,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 "" @@ -4021,19 +4360,19 @@ msgstr "" -#: ../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 +msgstr "Връзката със сървъра пропадна" + +#: ../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 "" @@ -4044,5 +4383,5 @@ "сървъра.

Желаете ли да възстановим и тези възли също?" -#: ../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 "Възстановяване на изтрити допълнителни възли?" @@ -4062,9 +4401,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 +msgstr "Характеристики в моята база дании (локалната база данни)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4072,110 +4411,112 @@ 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 +msgstr "Характеристики в тяхната база дании (базата данни на сървъра)" + +#: ../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 +msgstr "Координати:" + +#: ../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 +msgstr "Изтрито състояние:" + +#: ../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 +msgstr "Видимо състояние:" + +#: ../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 +msgstr "не е изтрито" + +#: ../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 +msgstr "видимо (на сървъра)" + +#: ../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 +msgstr "не е видимо (на сървъра)" + +#: ../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 +msgstr "Запазване копие на местната версия" + +#: ../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 +msgstr "Физическо изтриване от местната база данни" + +#: ../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 +msgstr "Запазване на моите координати" + +#: ../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 +msgstr "Запазване на техните координати" + +#: ../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 "" +msgstr "Да, нулирай ID" + +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "Нулирай ID" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "Да, изчисти го!" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4183,24 +4524,26 @@ "dataset.
Do you agree?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +"JOSM ще трябва да премахне вашият местен примитив с ID {0}
от " +"базата данни.
Съгласни ли сте?" + +#: ../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 +msgstr "Премахни от базата данни" + +#: ../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 "" +msgstr "Примитив" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 @@ -4219,5 +4562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51 msgid "" -msgstr "" +msgstr "<неопределено>" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 @@ -4237,10 +4580,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 @@ -4249,10 +4593,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 @@ -4266,21 +4611,21 @@ #. 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}" -msgstr "" +msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126 msgid "My version (local dataset)" -msgstr "" +msgstr "Моя версия (местна база данни)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149 msgid "Their version (server dataset)" -msgstr "" +msgstr "Тяхна версия (база данни на сървъра)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid ">" -msgstr "" +msgstr ">" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 @@ -4304,5 +4649,142 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +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}'' не трябва да е празен" + +#: ../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}''" + +#: ../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} пътя" + +#: ../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} релации" + +#: ../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} начало" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4318,10 +4800,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 @@ -4329,5 +4811,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}" @@ -4358,36 +4840,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 +msgstr "Прекъсни разрешаване на кофликти и затвори диалоговия прозорец" + +#: ../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 +msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +msgstr "Прилагане на резолюцията" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgstr "Затваряне въпреки всичко" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +msgstr "Продължаване разрешаването на кофликти" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4399,150 +4875,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 +msgstr "Конфликтът не е разрешен напълно" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +msgstr "Разрешаване на конфликти" + +#: ../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 +msgstr "Разрешаване на конфликти за ''{0}''" + +#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 +msgstr "индекс извън границите. Имаме: {0}" + +#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 +msgstr "Точка от историята" + +#: ../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 +msgstr "Покажи" + +#: ../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 +msgstr "Показване историята на избрания примитив" + +#: ../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 "" - -#: ../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 +msgstr "Активиране" + +#: ../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 +msgstr "Активиране на избрания слой" + +#: ../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 +msgstr "Обедини този слой с друг слой" + +#: ../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 +msgstr "Информация за слоя" + +#: ../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." @@ -4551,28 +4995,22 @@ msgstr[1] "Това ще промени до {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" @@ -4581,89 +5019,84 @@ msgstr[1] "Промяна параметрите на {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 +msgstr "Промяна на връзка" + +#: ../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 "Изтриване на параметри" @@ -4672,34 +5105,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 +msgstr "Връзки" + +#: ../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 +msgstr "Отваряне списъка с всички връзки." + +#: ../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 +msgstr "Връзки: {0}" + +#: ../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 +msgstr "Отвори редактор за избраната връзка" + +#: ../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 +msgstr "Изтриване на избраната връзка" + +#: ../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 +msgstr "Създаване на нова релация" + +#: ../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 "" @@ -4732,23 +5165,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} пътя" - -#: ../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} релации" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4756,14 +5175,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." @@ -4772,64 +5186,99 @@ "левия панел." -#: ../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] "Автор" + +#: ../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 +msgstr "Свали избраните връзки" + +#: ../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 +msgstr "Свали членовете на връзките" + +#: ../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 "" @@ -4837,48 +5286,44 @@ "loaded" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +"Подчинената връзка
{0}
е изтрита на сървъра. Не може да бъде " +"заредена." + +#: ../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 +msgstr "Връзката е изтрита" + +#: ../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 +msgstr "Сваляне на връзка {0}" + +#: ../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 +msgstr "Етикети и членове" + +#: ../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 " @@ -4887,14 +5332,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 "" @@ -4904,9 +5349,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 "" @@ -4916,15 +5361,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4932,5 +5377,5 @@ msgstr "" -#: ../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 " @@ -4938,20 +5383,20 @@ msgstr "" -#: ../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 "" @@ -4960,57 +5405,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 "" +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 +msgstr "Редактор на връзки: Сортиране" + +#: ../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 +msgstr "Редактор на връзки: Преместване нагоре" + +#: ../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 +msgstr "Редактор на връзки: Преместване надолу" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014 msgid "Remove the currently selected members from this relation" -msgstr "" +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 +msgstr "Редактор на връзки: Премахване" + +#: ../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 +msgstr "Да, създай конфликт и затвори" + +#: ../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 +msgstr "Не, продължава редактирането" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5019,9 +5464,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 +msgstr "Конфликт в данните" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 #, java-format msgid "" @@ -5030,20 +5475,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 @@ -5053,37 +5494,37 @@ msgstr "ОК" -#: ../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 +msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" + +#: ../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 +msgstr "Добави празен етикет" + +#: ../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 +msgstr "Сваляне всички непълни пътища и възли от връката" + +#: ../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 +msgstr "Редактор на връзки: Сваляне на членове" + +#: ../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 "" @@ -5093,30 +5534,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 +msgstr "Да, приложи го!" + +#: ../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 +msgstr "Не, не прилагай!" + +#: ../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 +msgstr "Увеличение до" + +#: ../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 "" @@ -5124,28 +5565,33 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 msgid "Refers to" -msgstr "" +msgstr "Отнася се за" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 msgid "Linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgstr "Свързано" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java: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 +msgstr "Зареждане на родителските връзки" + +#: ../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 "" @@ -5158,19 +5604,19 @@ #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" +msgstr "Създаване на нова релация в слой \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" +msgstr "Редактиране на нова връзка в слой ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "" +msgstr "Редактиране връзка #{0} в слой ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 msgid "Load relation" -msgstr "" +msgstr "Зареждане на връзка" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 @@ -5178,34 +5624,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} обекти" - -#: ../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 "Изберете първо отметка" @@ -5255,40 +5688,39 @@ msgid "Download area too large; will probably be rejected by server" msgstr "" -"Областта за сваляне е прекалено голяма. Вероятно сървъра ще откаже обработка " -"на заявката." +"Областта за сваляне е прекалено голяма. Сървърът вероятно ще откаже " +"обработка на заявката." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" -msgstr "Областта за сваляне е ок, размера е приемлив за сървъра." +msgstr "Областта за сваляне е ОК, размерът е приемлив за сървъра." #. 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 "Не може да се получат резултати от търсене от сървъра" +msgstr "Не могат да се получат резултати от търсене от сървъра" #. 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 "име" @@ -5327,37 +5759,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: " @@ -5366,5 +5798,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 "Интерактивна карта" @@ -5391,47 +5823,75 @@ msgstr "Номера квадранти" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, fuzzy, java-format +msgid "History for node {0}" +msgstr "История за {0} {1}" + +#: ../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 +msgstr "Затваряне на диалоговия прозорец" + +#: ../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 "" +#: ../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" @@ -5749,14 +6209,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5932,8 +6406,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" #. @@ -6030,4 +6510,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6141,6 +6624,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 @@ -6148,187 +6631,460 @@ #: 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 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Списък с промени {0}" + +#: ../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 msgid "Version {0} created on {1} by {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +msgstr "Версия {0} създадена на {1} от {2}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 +msgstr "Версия" + +#: ../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] "" + +#: ../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] "" + +#: ../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] "" + +#: ../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 @@ -6336,29 +7092,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" @@ -6367,14 +7123,14 @@ msgstr[1] "изображения" -#: ../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 @@ -6382,82 +7138,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 "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" -#: ../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" @@ -6517,5 +7273,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}" @@ -6531,10 +7287,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." @@ -6545,11 +7301,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 @@ -6591,4 +7347,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." @@ -6611,64 +7372,64 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../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 "" -#: ../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" @@ -6676,5 +7437,5 @@ msgstr[1] "следи" -#: ../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" @@ -6682,5 +7443,5 @@ msgstr[1] "точки" -#: ../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" @@ -6689,5 +7450,5 @@ msgstr[1] "следа с {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" @@ -6696,5 +7457,5 @@ msgstr[1] "{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" @@ -6703,9 +7464,9 @@ msgstr[1] "{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" @@ -6713,5 +7474,5 @@ msgstr[1] "маркери" -#: ../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" @@ -6732,5 +7493,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}." @@ -6738,5 +7499,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 "Невъзможно да се синхронизира в слоя, който се изпълнява." @@ -6767,5 +7528,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 " @@ -6775,5 +7536,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 " @@ -6783,29 +7544,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 "(URL беше: " -#: ../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 @@ -6813,27 +7574,27 @@ 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 @@ -6841,14 +7602,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 "Въведете нова двойка ключ/стойност" @@ -6987,40 +7748,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 "Цветове" @@ -7065,5 +7826,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Автомобил" @@ -7085,16 +7846,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:" #. @@ -7124,12 +7886,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 "Пеш" @@ -7288,5 +8050,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Draw the boundaries of data loaded from the server." -msgstr "Изобразяване границата на областа, свалена от сървъра." +msgstr "Изобразяване границата на свалената от сървъра област." #. virtual nodes @@ -7316,5 +8078,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 "Показване на стартова картинка" @@ -7322,23 +8084,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 "Безрежимна работа (Потлач стил)" -#: ../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 "Да не се изисква превключване на режими (Потлач стил работа)" -#: ../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 "Външен вид" @@ -7368,56 +8141,56 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +msgstr "Използван стил" + +#: ../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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "Добавяне на URL за разширение на JOSM." + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +msgstr "Въведете URL" + +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "Редактиране на URL за разширение на JOSM." + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 " @@ -7425,42 +8198,42 @@ 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 "Картографска проекция" @@ -7493,12 +8266,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 "Основен URL адрес на OSM сървъра (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Основен URL адрес на сървъра" #. 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 @@ -7525,61 +8290,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 "" -#: ../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 "" +msgstr "URL: {0}" + +#: ../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:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 +msgstr "Страница: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Version: {0}" -msgstr "" - -#: ../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 +msgstr "Версия: {0}" + +#: ../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 +msgstr "Копиране на подразбиращите се" + +#: ../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 "" -#: ../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 "" @@ -7773,36 +8537,59 @@ 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} обекти" + +#: ../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 @@ -7810,15 +8597,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 @@ -7828,22 +8615,22 @@ msgstr[1] "Промяна {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}''" @@ -7882,11 +8669,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 " @@ -7896,38 +8683,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 "GPX файлове" -#: ../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 "Мейл" -#: ../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 "Ключови думи" @@ -7937,9 +8724,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 "" @@ -7950,10 +8737,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 @@ -7963,12 +8750,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 "" -#: ../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" @@ -7989,6 +8776,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 @@ -7998,20 +8785,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 "" -#: ../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 " @@ -8019,34 +8826,34 @@ msgstr "" -#: ../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 импортиране!" @@ -8057,9 +8864,9 @@ msgstr "" -#: ../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 "" @@ -8070,15 +8877,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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8086,33 +8893,91 @@ msgstr "" -#: ../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 +msgstr "Изчакване 10 секунди " + +#: ../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 +msgstr "ОК - нов опит" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 #, java-format msgid "Starting retry {0} of {1}." @@ -8123,46 +8988,50 @@ #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Code={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Сървърът отговори с код на грешка: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" -msgstr "" +msgstr "Файловете на сървъра на OSM са компресирани с алгоритъм bzip2" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 msgid "Invalid bz2 file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +msgstr "Невалиден bz2 файл." + +#: ../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 "Основен URL адрес на OSM сървъра (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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." @@ -8171,13 +9040,17 @@ "парола." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Основен URL адрес на сървъра" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../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." @@ -8186,20 +9059,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM сървърни файлове" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8208,5 +9081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8348,5 +9221,5 @@ #, java-format msgid "Unknown relation member type {0}" -msgstr "" +msgstr "Непознат тип на член от връзка - {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471 @@ -8383,5 +9256,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." -msgstr "" +msgstr "Сваляне на историята..." #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 @@ -8400,35 +9273,47 @@ "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет." -#: ../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 +#, fuzzy +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 "" @@ -8441,32 +9326,32 @@ " {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." msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 +msgstr[0] "{0} добавка е успешно свалена. Моля, рестартирайте JOSM." +msgstr[1] "{0} добавки са успешно свалени. Моля, рестартирайте JOSM." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75 #, java-format msgid "Downloading Plugin {0}..." -msgstr "" +msgstr "Сваляне на добавката {0}..." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "Пропускане на свалянето" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" -msgstr "" +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "За добавката {1} се изисква JOSM версия {0}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +msgstr "Сваляне на добавка" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" -msgstr "" +msgstr "Пропусни свалянето" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -8475,30 +9360,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 +msgstr "Зареждането на добавката {0} беше заявено, но тя не се изисква повече." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 +msgstr "Добавката {0} изисква програмата JOSM да бъде обновена до {1}." + +#: ../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 +msgstr "Добавката не е открита: {0}." + +#: ../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 " @@ -8509,21 +9394,21 @@ "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 +msgstr "Запазване на добавка" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -8533,5 +9418,5 @@ "право да презаписва текущите." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8541,10 +9426,10 @@ "\"{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 +msgstr "Съгласно информацията в добавката, авторът е {0}." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -8553,9 +9438,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 " @@ -8565,13 +9450,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 +msgstr "Добавката не може да бъде премахната. Вероятно е изключена." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +msgstr "Информация за добавка" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -8580,27 +9465,27 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 +msgstr "Още подробности" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" msgid_plural "Downloaded plugin information from {0} sites" -msgstr[0] "Сваляне на информация за разширението от {0} сайт" -msgstr[1] "Сваляне на информация за разширението от {0} сайта" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +msgstr[0] "Сваляне на информация за добавките от {0} сайт" +msgstr[1] "Сваляне на информация за добавките от {0} сайта" + +#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +msgstr "Добавката {0} не е достъпна. Обновяването е пропуснато." + +#: ../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 "" @@ -8613,9 +9498,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 "" @@ -8628,35 +9513,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" @@ -8670,14 +9555,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 "" @@ -8685,5 +9570,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 " @@ -8693,19 +9578,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 "" @@ -8714,5 +9599,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8721,5 +9606,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8733,5 +9618,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" @@ -8741,5 +9626,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8750,22 +9635,57 @@ "\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 "" @@ -8794,9 +9714,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 @@ -8804,27 +9742,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}" @@ -8832,47 +9783,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} of {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 следа" @@ -8985,19 +9936,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." @@ -9009,34 +9960,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" @@ -9046,29 +9997,29 @@ "Моля използвайте изисквания формат!" -#: ../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 "" @@ -9076,41 +10027,41 @@ "помогне?" -#: ../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 "" @@ -9121,9 +10072,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 "" @@ -9134,65 +10085,65 @@ "Очакван формат: {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." msgstr "Избраната 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 " @@ -9200,13 +10151,13 @@ msgstr "" -#: ../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 "Стойности по подразбиране" @@ -9227,5 +10178,5 @@ msgstr "Грешка във файла {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9238,12 +10189,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 "Грешка при зареждане на файла" @@ -9272,8 +10222,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" @@ -9284,21 +10234,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" @@ -9307,37 +10257,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 "Макс. размер на кеша (в MB)" -#: ../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." @@ -9355,9 +10316,9 @@ "данни създадени с това разширение." -#: ../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 "" @@ -9365,10 +10326,10 @@ "източници е включено" -#: ../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 " @@ -9377,5 +10338,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). " @@ -9385,42 +10346,40 @@ "текстове на тъмни фонове." -#: ../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 +"Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно." + +#: ../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 "Фиксирана площ (по подразбиране 100m2)" -#: ../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 "" @@ -9479,12 +10438,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Свързване с WMS Сървър..." +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 @@ -9518,20 +10475,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" @@ -9539,9 +10496,14 @@ 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 +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" @@ -9549,31 +10511,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 "Въвеждане Шир/Дълж за прескачане до позиция." - -#: ../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 @@ -9636,8 +10606,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25 msgid "Export as PNG format (only raster images)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +msgstr "Експортирай във формат PNG (само растерни изображения)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9661,6 +10631,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 "Празен слой" @@ -9676,7 +10646,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Център на растера: {0}" +msgstr "Размер на растера: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -9759,4 +10729,6 @@ "Remove the area from the relation before splitting it." msgstr "" +"Избраната област не може да бъде разделена, защото е член на връзка.\n" +"Премахнете областта от връзката преди да я разделите." #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 @@ -9778,5 +10750,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "файлове TCX (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -10027,17 +10999,17 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144 msgid "Rotate left" -msgstr "Завърти вляво" +msgstr "Завърти наляво" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146 msgid "Rotate image left" -msgstr "Завърти изображението вляво" +msgstr "Завърти изображението наляво" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163 msgid "Rotate right" -msgstr "Завърти вдясно" +msgstr "Завърти надясно" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165 msgid "Rotate image right" -msgstr "Завърти изображението вдясно" +msgstr "Завърти изображението надясно" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187 @@ -10123,5 +11095,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10 msgid "An unknown error has occurred" -msgstr "" +msgstr "Възникна непозната грешка" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 @@ -10201,6 +11173,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 "вода" @@ -10213,8 +11185,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 @@ -10387,5 +11355,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsData.java:130 msgid "no name" -msgstr "" +msgstr "няма име" #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45 @@ -10512,9 +11480,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 " @@ -10523,5 +11491,5 @@ msgstr "" -#: ../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 "" @@ -10724,13 +11692,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Редактиране на връзка" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Редактиране на връзки" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "Не е избрана връзка" #. Add menu @@ -10840,9 +11808,9 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" -msgstr "" +msgstr "Изчистване на кеша" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "изображение " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10957,10 +11925,10 @@ #, java-format msgid "{0} start" -msgstr "" +msgstr "{0} начало" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63 #, java-format msgid "{0} end" -msgstr "" +msgstr "{0} край" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 @@ -11102,5 +12070,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 "Име на улица" @@ -11119,29 +12087,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 "Извинете, за анонимни потребители това е недостъпно" @@ -11155,25 +12123,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" @@ -11186,38 +12144,38 @@ "Сигурни ли сте че искате да продължите?" -#: ../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 "Моля, изберете поне един затворен път който да бъде присъединен." -#: ../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 +msgstr "Поправяне на връзки" + +#: ../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 " @@ -11227,82 +12185,82 @@ "проверете дали няма да се появят грешки." -#: ../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 +msgstr "Премахнати елементи от връзки" + +#: ../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 "Въвеждане Шир/Дълж за прескачане до позиция." -#: ../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 "" "Не може да бъде прочетена Широчината, Дължината или Мащаба. Моля проверете." -#: ../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?" @@ -11314,25 +12272,25 @@ "Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги опростите?" -#: ../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 "" @@ -11423,53 +12381,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" @@ -11493,23 +12451,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 @@ -11598,9 +12589,9 @@ "правописни грешки." -#: ../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 "" @@ -11608,15 +12599,15 @@ "стойности" -#: ../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 "" @@ -11627,7 +12618,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 "Неправилна комбинация маркер/стойност" @@ -11635,80 +12626,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 "ЗА ПОПРАВКА" -#: ../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." @@ -11719,83 +12710,83 @@ "маркирането." -#: ../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 "Проверяване дали стойностите са правилни спрямо шаблони." -#: ../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 "Проверка за маркерни \"ЗА ПОПРАВКА\"" -#: ../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 "" "Използване на файла за проверка на правопис по подразбиране (препоръчвано)." -#: ../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}''" @@ -11940,7 +12931,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 "сграда" @@ -11954,5 +12945,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 "област" @@ -12035,5 +13026,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64 msgid "Reversed coastline: land not on left side" -msgstr "Обърната брегова линия: земята не е от ляво" +msgstr "Обърната брегова линия: земята не е отляво" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69 @@ -12052,5 +13043,5 @@ #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 msgid "Scanned Map..." -msgstr "" +msgstr "Сканирана карта..." #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 @@ -12090,5 +13081,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Възникна грешка" @@ -12133,17 +13124,17 @@ 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}" -msgstr "" +msgstr "WMS: {0}" #. This service serves the purpose of "just this once" without forcing the user @@ -12151,26 +13142,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 "" -#: ../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 +msgstr "домашната страница" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 msgid "WMS URL or Image ID:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 +msgstr "WMS URL or Image ID:" + +#: ../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 " @@ -12178,37 +13169,55 @@ msgstr "" -#: ../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 "" -#: ../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 "" @@ -12223,15 +13232,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" @@ -12240,90 +13277,102 @@ "разделителната способност." -#: ../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 "" -#: ../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 "" -#: ../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}" msgstr "Неподдъжана 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 URL" -#: ../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 "Въведете име на меню и WMS URL" -#: ../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)" #. * @@ -12393,5 +13442,5 @@ "Позволява на потребителя да създава различни цветови схеми и да превключва " "между тях. Просто променяте цветовете и създавате нова схема. Удобно за " -"превключване към бях фон и съответни цветове за по-добра видимост при ярка " +"превключване към бял фон и съответни цветове за по-добра видимост при ярка " "дневна светлина. Вижте диалога в настройките на JOSM - 'Настройки на " "картата' (странно, но истина :-)" @@ -12726,62 +13775,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" @@ -12796,5 +13790,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 "Брой платна" @@ -12809,5 +13803,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" @@ -12817,10 +13810,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 "Макс. скорост (км/ч)" @@ -12864,9 +13857,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 "Еднопосочна" @@ -12914,13 +13907,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 "Мост" @@ -12962,13 +13955,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 "Тунел" @@ -13008,12 +14001,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 "Просека" @@ -13053,12 +14046,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 "Насип" @@ -13214,17 +14207,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 "Ширина (метри)" @@ -13251,4 +14244,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" @@ -13267,11 +14261,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 "Пътна настилка" @@ -13281,4 +14276,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" @@ -13293,9 +14289,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 "асфалтиран път" @@ -13303,10 +14300,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" @@ -13314,12 +14374,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)" @@ -13400,20 +14542,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 "Без изход" @@ -13426,8 +14568,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 "Достъп" @@ -13462,32 +14604,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 "да" @@ -13500,40 +14657,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 "предназначен" @@ -13546,19 +14703,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 "с назначение" @@ -13581,65 +14738,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т)" @@ -13654,10 +14816,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 "Кон" @@ -13673,17 +14835,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" @@ -13695,30 +14856,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 "Мин. скорост (км/ч)" @@ -13726,25 +14887,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 "Кръгово движение" @@ -13755,5 +14916,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 "Редактиране пътен възел" @@ -13769,5 +14930,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" #. @@ -13775,9 +14936,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 "Тип" @@ -13797,10 +14958,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 "Автомагистрална връзка" @@ -13822,10 +14983,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 "Автострадна връзка" @@ -13847,10 +15008,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 "Връзка с главен път" @@ -13872,5 +15033,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" @@ -13885,9 +15046,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 "Некласифициран" @@ -13901,9 +15062,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 "Жилищна улица" @@ -13933,10 +15094,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 "Направлява автобуси" @@ -13966,6 +15127,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 "ремонт" @@ -13976,10 +15137,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 "Редактиране тунел" @@ -13987,19 +15148,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 "Пътен възел" @@ -14015,5 +15176,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "кръгово" @@ -14022,5 +15183,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Алея за езда" @@ -14028,5 +15189,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Редактиране алея за езда" @@ -14034,5 +15195,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Велоалея" @@ -14042,11 +15203,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 "Алея / Тротоар" @@ -14055,11 +15222,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 "Пешеходна улица" @@ -14068,5 +15241,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Редактирай пешеходна улица" @@ -14074,5 +15247,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Стълбище" @@ -14082,5 +15255,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 "Редактирай стълбище" @@ -14089,5 +15262,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Черен път" @@ -14096,39 +15269,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-ви клас" @@ -14137,5 +15282,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Редактирай черен път 1-ви клас" @@ -14143,5 +15288,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-ри клас" @@ -14150,5 +15295,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Редактирай черен път 2-ри клас" @@ -14156,5 +15301,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-ти клас" @@ -14163,5 +15308,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Редактирай черен път 3-ти клас" @@ -14169,5 +15314,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-ти клас" @@ -14176,5 +15321,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Редактирай черен път 4-ти клас" @@ -14182,5 +15327,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-ти клас" @@ -14189,5 +15334,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Редактирай черен път 5-ти клас" @@ -14196,5 +15341,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Пътека" @@ -14203,19 +15348,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 "Туристическа пътека" @@ -14225,5 +15373,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 "Редактиране туристическа пътека" @@ -14231,5 +15379,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Планинска туристическа пътека" @@ -14239,5 +15387,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 "Редактиране планинска туристическа пътека" @@ -14245,5 +15393,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Трудна планинска туристическа пътека" @@ -14253,5 +15401,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 "Редактиране трудна планинска туристическа пътека" @@ -14259,5 +15407,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Алпийска туристическа пътека" @@ -14267,5 +15415,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 "Редактиране алпийска туристическа пътека" @@ -14273,5 +15421,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Трудна алпийска туристическа пътека" @@ -14281,5 +15429,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 "Редактиране трудна алпийска туристическа пътека" @@ -14287,5 +15435,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Екстремна алпийска туристическа пътека" @@ -14295,5 +15443,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 "Редактиране екстремна алпийска туристическа пътека" @@ -14301,10 +15449,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 "Магистрален възел" @@ -14312,15 +15460,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 "Услуги" @@ -14328,5 +15476,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Редактирай служба услуги" @@ -14340,4 +15488,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" #. @@ -14357,18 +15507,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 "Оператор" @@ -14377,5 +15529,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Светофар" @@ -14385,5 +15537,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Тип пешеходна пътека" @@ -14392,27 +15544,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 "Пресичане върху кон" @@ -14420,6 +15572,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 "Пресичане с велосипед" @@ -14428,11 +15580,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 "Име на типа пътека (UK)" @@ -14440,30 +15592,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 "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Стоп" @@ -14471,5 +15623,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Пешеходна пътека" @@ -14478,14 +15630,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 "Мини кръгово движение" @@ -14496,14 +15648,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 "Обръщало" @@ -14513,20 +15665,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 "Пътна камера" @@ -14534,5 +15686,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Телефон за спешен случай" @@ -14540,5 +15692,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Наклон" @@ -14546,5 +15698,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Стръмен наклон" @@ -14553,10 +15705,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 "Редактирай брод" @@ -14564,5 +15716,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Планински проход" @@ -14570,5 +15722,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Редактирай планински проход" @@ -14576,11 +15728,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 "Надморска височина" @@ -14588,5 +15740,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Прегради" @@ -14594,5 +15746,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Дирек" @@ -14600,5 +15752,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Редактирай дирек" @@ -14643,16 +15795,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 "Вело бариера" @@ -14661,5 +15813,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Бетонен блок" @@ -14667,5 +15819,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Тексаска мрежа (препятствие за животни)" @@ -14673,10 +15825,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 "Бус трап" @@ -14684,15 +15836,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 "Място за плащане пътна такса" @@ -14700,5 +15852,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Редактирай място за плащане пътна такса" @@ -14706,10 +15858,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 "Редактирай граничен контрол" @@ -14719,5 +15871,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Плет" @@ -14726,5 +15878,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Ограда / стобор" @@ -14733,5 +15885,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Стена" @@ -14739,5 +15891,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Градска стена" @@ -14746,5 +15898,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Подпорна стена" @@ -14756,15 +15908,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 "Порта" @@ -14772,50 +15924,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 "Накланяща преграда (bump gate)" #. 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 "Стъпалова преграда" @@ -14823,25 +15975,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 "Редактирай двойна врата" @@ -14852,10 +16004,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 "Извор" @@ -14863,5 +16015,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Редактирай извора" @@ -14869,5 +16021,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Отточен канал" @@ -14875,10 +16027,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 "Поток" @@ -14886,10 +16038,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 "Канал" @@ -14897,10 +16049,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 "Река" @@ -14910,5 +16062,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 "Редактирай река" @@ -14916,15 +16068,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 "Редактирай сушата" @@ -14932,15 +16084,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 "Резервоар" @@ -14948,15 +16100,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 "Редактирай закрит резервоар" @@ -14964,5 +16116,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Речен бряг" @@ -14971,10 +16123,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 "Мочурище" @@ -14985,14 +16137,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 "тресавище" @@ -15006,35 +16158,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 "Плаж" @@ -15042,20 +16194,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 "Скала" @@ -15063,10 +16215,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 "Крайбрежие" @@ -15074,5 +16226,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Редактирай крайбрежието" @@ -15080,5 +16232,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Ферибот маршрут" @@ -15086,5 +16238,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Ферибот" @@ -15093,5 +16245,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Корабостроителница" @@ -15099,10 +16251,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 "Док" @@ -15110,5 +16262,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Редактирай док" @@ -15116,5 +16268,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Язовирна стена" @@ -15122,15 +16274,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 "Шлюзова врата" @@ -15139,5 +16291,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Бент / преливник" @@ -15145,20 +16297,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 "Разширение за обръщане" @@ -15167,15 +16319,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 "Кей" @@ -15183,10 +16335,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 "Ферибот терминал" @@ -15194,10 +16346,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 "Хелинг" @@ -15207,5 +16359,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 "Редактирай хелинг" @@ -15213,10 +16365,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 "ЖП Линия" @@ -15224,5 +16376,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Редактирай ЖП Линия" @@ -15252,8 +16404,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 "Незадължителни типове" @@ -15267,35 +16419,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 "Монорелса" @@ -15303,45 +16455,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 "Направляван автобус" @@ -15349,5 +16501,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Редактирай направляван автобус" @@ -15356,14 +16508,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 "Изоставена ЖП линия" @@ -15372,5 +16524,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Регулиран ЖП прелез" @@ -15379,5 +16531,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "ЖП прелез" @@ -15387,5 +16539,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Тип пресичане" @@ -15393,5 +16545,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "ЖП Обръщаща платформа" @@ -15400,10 +16552,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 "Седалков лифт" @@ -15411,10 +16563,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 "Влек" @@ -15422,10 +16574,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 "Кабинков лифт" @@ -15433,10 +16585,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 "Гондола" @@ -15444,5 +16596,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Редактиране на гондола" @@ -15450,5 +16602,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 "Гара / Станция / Спирка" @@ -15459,10 +16611,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 "Бензиностанция" @@ -15472,9 +16624,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" @@ -15494,106 +16875,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 "Ref номер" + +#. 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 "Редактиране велосипеди под наем" @@ -15602,15 +17018,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-Референция" @@ -15618,5 +17034,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Малка ЖП гара" @@ -15624,5 +17040,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Редактирай малка ЖП гара" @@ -15630,5 +17046,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Трамвайна спирка" @@ -15637,5 +17053,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Редактирай трамвайна спирка" @@ -15643,5 +17059,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "ЖП платформа" @@ -15650,5 +17066,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Редактирай ЖП платформа" @@ -15660,5 +17076,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 "Референция (коловоз #)" @@ -15666,10 +17082,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 "Вход в метро" @@ -15678,10 +17094,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 "Инвалидна количка" @@ -15690,5 +17106,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Автогара" @@ -15697,5 +17113,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Редактирай автогара" @@ -15703,5 +17119,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Автобусна спирка" @@ -15711,5 +17127,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 "Редактирай автобусна спирка" @@ -15718,8 +17134,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 "Навес" @@ -15727,10 +17141,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 "Редактирай автобусна платформа" @@ -15738,5 +17152,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Такси" @@ -15744,5 +17158,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Редактирай стоянка таксита" @@ -15750,5 +17164,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Летище" @@ -15756,15 +17170,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15773,5 +17187,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Настаняване" @@ -15783,5 +17197,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Хотел" @@ -15790,15 +17204,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 "Мотел" @@ -15806,20 +17220,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 "Бунгало" @@ -15827,10 +17241,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 "Хостел / студентско общежитие" @@ -15838,30 +17252,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 "Къмпинг" @@ -15869,10 +17283,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 "Храна и напитки" @@ -15883,5 +17297,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ресторант" @@ -15889,5 +17303,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Редактирай ресторант" @@ -15895,5 +17309,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 "Кухня" @@ -15901,61 +17315,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 "Заведение за бързо хранене" @@ -15963,9 +17377,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 "Кафене" @@ -15973,10 +17387,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 "Бар" @@ -15984,20 +17397,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 "Бар" @@ -16005,10 +17416,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 "Нощен клуб" @@ -16016,33 +17426,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 "Музей" @@ -16050,10 +17451,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 "Зоопарк" @@ -16062,10 +17462,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 "Място с добра гледка" @@ -16073,25 +17472,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 "Творба на изкуството" @@ -16099,5 +17497,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Редактирай творба на изкуството" @@ -16105,86 +17503,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 "Редактирай навес" @@ -16192,25 +17715,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 "място за огън" +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 "Замък" @@ -16219,20 +17742,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 "Архиологични разкопки" @@ -16241,10 +17763,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 "Поле на битка" @@ -16252,5 +17773,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Редактирай поле на битка" @@ -16258,15 +17779,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 "Паметник" @@ -16274,45 +17795,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 "Площадка" @@ -16320,15 +17841,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 "Редактирай риболов" @@ -16336,15 +17857,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 "Редактирай стадион" @@ -16358,6 +17879,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 "вид спорт:" @@ -16749,30 +18270,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 "спорт" @@ -16782,227 +18303,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 "Редактирай многобой" @@ -17041,248 +18560,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 "Боулинг зала" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Редактирай боулинг зала" -#: 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 "Стрелба" @@ -17290,178 +18801,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 "Игра с асим.мет.топки (bowls)" #. 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 "Строеж" @@ -17469,5 +18980,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Обществена сграда" @@ -17475,10 +18986,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 "Кметство" @@ -17486,10 +18997,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 "Посолство" @@ -17497,10 +19008,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 "Съдебна сграда" @@ -17509,10 +19020,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 "Затвор" @@ -17521,10 +19032,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 "Полиция/Милиция" @@ -17534,10 +19045,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 "Пожарна" @@ -17546,10 +19057,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 "Пощенска станция" @@ -17557,5 +19068,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Редактирай пощенска станция" @@ -17563,15 +19074,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 "Училище" @@ -17579,10 +19090,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 "Университет" @@ -17590,10 +19101,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 "Колеж" @@ -17601,5 +19112,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Редактирай колеж" @@ -17607,5 +19118,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Кино" @@ -17614,10 +19125,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 "Библиотека" @@ -17626,10 +19137,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 "Център на изкуствата" @@ -17637,10 +19147,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 "Театър" @@ -17649,10 +19159,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 "Място за богослужение" @@ -17662,5 +19172,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 "Редактирай място за богослужение" @@ -17669,6 +19179,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 "Религия" @@ -17677,66 +19187,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 "Конфесия" @@ -17745,81 +19255,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 "Адреси" @@ -17828,5 +19338,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Редактиране на информацията за адреса" @@ -17834,5 +19344,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Номер" @@ -17840,20 +19350,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 "Код на държава" @@ -17861,5 +19371,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Интерполация на адреси" @@ -17868,5 +19378,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Редактирай интерполация на адреси" @@ -17874,71 +19384,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 "Маяк / Светлинен фар" @@ -17946,10 +19452,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 "Мелница" @@ -17957,10 +19463,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 "Тръбопровод" @@ -17968,10 +19474,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 "Пречиствателна станция" @@ -17981,10 +19487,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 "Кран" @@ -17992,10 +19498,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 "Маяк / Радиопредавател" @@ -18003,10 +19509,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 "Точка на наблюдение" @@ -18014,10 +19520,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 "Видеонаблюдение" @@ -18025,5 +19531,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Редактирай видеонаблюдение" @@ -18031,5 +19537,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Електроцентрала" @@ -18039,39 +19545,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 "Електростанция" @@ -18080,10 +19586,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 "Електроподстанция" @@ -18092,5 +19598,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Редактирай електроподстанция" @@ -18098,10 +19604,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 "Електрически стълб от ЕПМ" @@ -18112,5 +19618,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 "Редактирай стълб от ЕПМ" @@ -18118,5 +19624,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Линия за електропренос" @@ -18125,46 +19631,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 "Ref номер" - #. 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 "Телефон" @@ -18173,5 +19673,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Редактирай телефон" @@ -18179,5 +19679,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 "Монети" @@ -18185,5 +19685,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 "Банкноти" @@ -18191,5 +19691,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 "Електрони средства за разплата" @@ -18197,5 +19697,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 "Дебитни карти" @@ -18203,15 +19703,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 "Рециклиране" @@ -18220,5 +19720,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Редактиране на станция за рециклиране" @@ -18226,80 +19726,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 "Фонтан" @@ -18308,10 +19804,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 "Питейна вода" @@ -18320,10 +19816,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 "Дестка ясла" @@ -18331,25 +19827,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 "Бакалия" @@ -18357,10 +19863,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 "Будка" @@ -18368,10 +19873,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 "Автомат за стоки" @@ -18379,5 +19903,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Редактирай автомат за стоки" @@ -18385,88 +19909,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 "Месарница" @@ -18474,10 +19998,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 "Фурна" @@ -18485,10 +20008,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 "Цветарски магазин" @@ -18496,20 +20018,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 "Алкохол" @@ -18517,60 +20037,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 "Аудио HiFi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Редактирай магазин за Аудио HiFi" -#. 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 "Градински център" @@ -18578,10 +20092,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 "Железария" @@ -18589,10 +20102,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 "Магазин \"Направи си сам\"" @@ -18600,60 +20112,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 "Химическо чистене" @@ -18661,10 +20167,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 "Пералня" @@ -18672,10 +20177,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 "Туристически стоки (за активен отдих)" @@ -18683,35 +20187,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 "Банка" @@ -18719,16 +20220,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 "Обмяна на валута" @@ -18736,5 +20235,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Редактирай обмяна на валута" @@ -18742,15 +20241,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 "Доктори" @@ -18758,20 +20257,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 "Аптека" @@ -18779,5 +20276,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Редактирай аптека" @@ -18785,10 +20282,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 "Болница" @@ -18796,10 +20292,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 "Пункт за връзка със спешна помощ" @@ -18808,5 +20304,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Редактирай пункт за връзка със спешна помощ" @@ -18815,20 +20311,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)" @@ -18836,5 +20332,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 "Ветеринар" @@ -18843,55 +20339,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 "Редактирай графство" @@ -18899,15 +20395,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)" @@ -18915,10 +20411,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 "Квартал/предградие" @@ -18926,25 +20422,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 "Редактирай махала" @@ -18952,5 +20448,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Местност" @@ -18958,10 +20454,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 "Остров" @@ -18969,11 +20465,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 "Пещерен вход" @@ -18981,10 +20490,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 "Връх" @@ -18992,10 +20501,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 "Ледник" @@ -19003,10 +20512,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 "Вулкан" @@ -19014,70 +20523,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 "Дърво" @@ -19086,15 +20595,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 "Гора" @@ -19103,5 +20612,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Редактирай гората" @@ -19109,17 +20618,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 "Гора" @@ -19128,14 +20637,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 "Редактирай природен резерват" @@ -19143,25 +20652,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 "Скалист склон" @@ -19169,10 +20678,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 "Пустош" @@ -19180,5 +20689,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Редактиране пустош" @@ -19186,5 +20695,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Двор ферма" @@ -19193,45 +20702,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 "Редактирай общинска земя" @@ -19239,25 +20748,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 "Зелено село" @@ -19265,10 +20774,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 "Общи" @@ -19276,20 +20785,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 "Спортна площадка" @@ -19297,5 +20806,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Редактирай спортна площадка" @@ -19303,15 +20812,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 "Църковно гробище" @@ -19319,9 +20828,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 "Гробище" @@ -19329,39 +20838,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 "Железопътен път" @@ -19369,15 +20878,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 "Редакирай военна земя" @@ -19385,55 +20894,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 "Мултиполигон" @@ -19443,5 +20952,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 "Редактиране мултиполигон" @@ -19450,10 +20959,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 "вътрешен сегмент" @@ -19461,5 +20970,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Ограничения при завиване" @@ -19468,5 +20977,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Редактиране на ограничения при завиване" @@ -19474,34 +20983,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 "само направо" @@ -19510,15 +21019,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 "до път" @@ -19526,5 +21035,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Маршрут" @@ -19533,5 +21042,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Редактиране маршрут" @@ -19539,5 +21048,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Тип маршрут" @@ -19609,5 +21118,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 @@ -19616,17 +21125,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 "ски" @@ -19679,5 +21188,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 @@ -19686,13 +21195,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 "обиколка" @@ -19706,10 +21215,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 "Описание на символ" @@ -19717,31 +21226,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)" @@ -19750,30 +21259,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 "точка за спиране назад" @@ -20211,11 +21720,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 "остарял, вече невалиден" @@ -20541,41 +22050,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 @@ -22276,5 +23748,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 "светла_вода" @@ -22873,55 +24345,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22935,5 +24358,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 "туризъм" @@ -23005,8 +24428,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 "исторически" @@ -23077,8 +24500,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 "зеленина" @@ -23092,5 +24515,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "кариер" @@ -23104,5 +24527,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "сметище" @@ -23124,5 +24547,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "басейн" @@ -23136,5 +24559,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "гора" @@ -23148,5 +24571,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "двор ферма" @@ -23169,5 +24592,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "търговия на дребно" @@ -23181,5 +24604,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "индустрия" @@ -23193,5 +24616,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "индустриални развалини" @@ -23205,5 +24628,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "зелена площ" @@ -23217,5 +24640,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "ЖП" @@ -23272,7 +24695,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 "военни" @@ -23286,5 +24709,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "гробище" @@ -23297,5 +24720,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "връх" @@ -23310,5 +24733,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "ледник" @@ -23322,5 +24745,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "вулкан" @@ -23375,8 +24798,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 "природа" @@ -23390,5 +24813,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "храсталак" @@ -23402,20 +24825,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 @@ -23426,5 +24837,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "кал" @@ -23438,5 +24849,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "плаж" @@ -23514,8 +24925,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 "маршрут" @@ -23563,7 +24974,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 "граница" @@ -23705,10 +25116,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 "място" @@ -23756,6 +25176,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 "адрес" @@ -23970,5 +25390,5 @@ #: build/trans_validator.java:73 msgid "relation without type" -msgstr "релация без тип" +msgstr "връзка без тип" #. relation : E : type != * @@ -24052,6 +25472,102 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Избор на Tableau d'Assemblage" +#~ 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 "Change {0} {1}" +#~ msgstr "Промени {0} {1}" + +#~ 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 "Delete Layer" +#~ msgstr "Изтриване на слой" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Наистина ли искате да изтриете слой ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Изтриване на всички" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Изтриване слой {0} от {1}" + +#~ 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 "{0} Plugin successfully updated. Please restart JOSM." @@ -24138,7 +25654,4 @@ #~ msgid "Object" #~ msgstr "Обект" - -#~ msgid "Not implemented yet." -#~ msgstr "Не е добавено още." #~ msgid "Layers: {0}" @@ -24400,4 +25913,7 @@ #~ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Избор на Tableau d'Assemblage" + #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -24546,7 +26062,4 @@ #~ msgstr "Неуспешно обновяване." -#~ msgid "Failed to update the selected primitives." -#~ msgstr "Грешка при обновяването на избраните примитиви." - #~ msgid "Missing primitive" #~ msgstr "Липсва примитив." Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 17484) +++ /applications/editors/josm/i18n/po/cs.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 08:44+0000\n" -"Last-Translator: Jezevec \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:24+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Vytváří se grafické rozhraní programu (GUI)" #. 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 "Pomoc" -#: ../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 "Projekce {0} nemohla být aktivována. Používam Mercator." -#: ../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 @@ -96,154 +99,161 @@ #: ../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 "Chyba" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." - -#: ../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] "Máte neuložené změny. Zahodit změny a pokračovat?" +msgstr[1] "Máte neuložené změny. Zahodit změny a pokračovat?" +msgstr[2] "Máte neuložené změny. Zahodit změny a pokračovat?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Neuložené změny" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Máte neuložené změny. Zahodit změny a pokračovat?" - -#: ../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 "Uložit a ukončit" -#: ../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 "Neuložit změny a ukončit" -#: ../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 "Zrušit" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorují se nekorektní URL: \"{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 "Varování" -#: ../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 "Ignoruji poškozený soubor z URL: \"{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 "Nemohu přečíst soubor ''{0}''. Chyba je:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +278,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" @@ -306,5 +317,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" @@ -328,6 +339,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 "Pluginy" @@ -342,8 +353,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 "" "UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na stránku s " @@ -351,9 +362,19 @@ "\"{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 "" +"UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na stránku s " +"historií pro OSM element pravděpodobně skončí chybou. Základní URL API je: " +"\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -364,5 +385,5 @@ "primitiv." -#: ../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 "Prosím vyberte cílovou vrstvu." @@ -372,11 +393,11 @@ msgstr "Vybrat cílovou vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Sloučit" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -387,5 +408,5 @@ "být sloučeny." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Žádné cílové vrstvy" @@ -402,11 +423,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 @@ -435,5 +456,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 "Zeměpisná šířka" @@ -442,30 +463,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 "Zeměpisná délka" +#: ../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 "Seřadit uzly do kruhu" -#: ../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 "Přesunout označené uzly do kruhu" -#: ../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 @@ -479,6 +500,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 @@ -486,58 +507,57 @@ msgstr "Nástroj: {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 "Vyberte minimálně 4 uzly" #. 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 "Informace" #. 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 "Seřadit uzly do přímky" -#: ../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 "Přesunout označené uzly na přímku" -#: ../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 "Vyberte minimálně 3 uzly" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -548,10 +568,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 "Narušení schopností API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -561,5 +581,5 @@ "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -570,9 +590,9 @@ "Délka hodnoty je {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Selhal předpoklad" -#: ../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}" @@ -580,37 +600,37 @@ "{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "výběr" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "stáhnout" +#: ../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 "Zvětšit na {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 "Zvětšit pohled na {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 @@ -620,22 +640,22 @@ msgstr "Zobrazení: {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 "Není zvoleno nic co by se dalo přiblížit" -#: ../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 "Není žádný konflikt, na který by se mohlo přiblížit" +#: ../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 "Spojit cesty" -#: ../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 "Spojit více cest do jedné" -#: ../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 "Prosím zvolte minimálně dvě cesty ke spojení" @@ -646,4 +666,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Přesto zkombinovat" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -651,19 +675,7 @@ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Přesto zkombinovat" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Změnit směr ?" - -#: ../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 "" -"Cesty nemohou být spojeny kvůli rozdílné orientaci. Chcete sjednotit jejich " -"orientaci?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -671,27 +683,34 @@ msgstr "Otočit a zkombinovat" -#: ../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 "" +"Cesty nemohou být spojeny kvůli rozdílné orientaci. Chcete sjednotit jejich " +"orientaci?" + +#: ../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 "Zadej hodnoty pro všechny konflikty" -#: ../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 "Vyřešit konflikty" -#: ../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 "Kombinovat {0} cesty" -#: ../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 "Všechny cesty byli prázdné" -#: ../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 " @@ -699,32 +718,32 @@ msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" +#: ../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 "Kopírovat" -#: ../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 "Vybrat označené objekty pro vložení." -#: ../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 "Prosím zvol něco ke kopírování" +#: ../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 "Vytvořit kruh" -#: ../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 "Vytvořit kruh ze tří uzlů" -#: ../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 "Tyto body nejsou v kruhu. Přerušuji." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -735,20 +754,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 "Smazat" @@ -758,85 +777,86 @@ msgstr "Smazat označené objekty" -#: ../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 "Přepsat" -#: ../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 "Soubor již existuje. Chcete jej přepsat ?" #. 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 "Rozdělit uzly" -#: ../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 "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky." +#: ../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 "Stáhnout z 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 "Stáhnout data z OSM serveru" -#: ../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 "Soubor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Stáhnout" -#: ../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 "Prosím zvol aspoň jeden úkol ke stažení" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "Stáhnout prvky odkazující na jeden z vybraných prvků" -#: ../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 "Došlo k {0} konfliktům během importu." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Konflikty během stahování" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -845,6 +865,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 "Duplikovat" @@ -868,28 +888,33 @@ msgstr "Ukončit JOSM" +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Všechny obrázky" + +#: ../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 "Exportovat do 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 "Exportovat data do GPX souboru." -#: ../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 "Nic nevyexportováno. Nejdříve stáhněte data." -#: ../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 "parametr ''{0}'' nesmí být null" -#: ../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}''." @@ -898,57 +923,58 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX souboru" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM Online Nápověda" -#: ../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 "Otevřít v prohlížeči" -#: ../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 "Upravit" -#: ../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 "Znovu načíst" -#: ../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 "Nápovědu můžete upravovat pouze z online nápovědy JOSM" -#: ../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 "Chyba při načítání stránky {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." msgstr "Chybí stránka nápovědy. Vytvořte ji v češtině." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1002,22 +1028,26 @@ msgstr "Sloučit aktuální vrstvu do jiné vrstvy" +#: ../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 "Spojit uzly" -#: ../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 "Spoj uzly do nejstaršího" -#: ../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 "Zvolte minimálně dva uzly ke spojení" -#: ../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 "Spojit uzly s různými členství v relaci?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Přesto sloučit" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1026,77 +1056,73 @@ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Přesto sloučit" - -#: ../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 "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." -#: ../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 "Spojit {0} uzly" +#: ../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 "Sloučit výběr" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Sloučit vybrané prvky do jiné vrstvy" +#: ../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 "Zrcadlit" -#: ../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 "Zrcadlit vybrané body a cesty." -#: ../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 "Zvolte minimálně jeden uzel nebo cestu" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "nahoru" -#: ../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 "Přesunout objekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "dolů" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "vlevo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "vpravo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Přesunout {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 "Přesunutí objektů {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 "Nemohu přesouvat objekty mimo svět." @@ -1104,5 +1130,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 "Nový" @@ -1112,17 +1138,22 @@ msgstr "Vytvořit novou mapu" -#: ../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 "Otevřít..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Otevřít soubor." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Nemohu přečíst soubor ''{0}''. Chyba je:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Otevřít soubor." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Neznámá role ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1160,21 +1191,17 @@ msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Povoleny pouze dva uzly" -#: ../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 "Výběr se musí skládat pouze z cest" -#: ../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 "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." - -#: ../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 " @@ -1183,9 +1210,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 "Vybrán pouze jeden uzel" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Ortogonalizovat" @@ -1201,13 +1228,28 @@ msgstr "Vložit ze schránky" -#: ../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 "Vložit Popisky" -#: ../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 "Použít popisky objektu ve schránce na všechny zvolené objekty." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Nahrávám {0}" +msgstr[1] "Nahrávám {0}" +msgstr[2] "Nahrávám {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Obnovit {0} prvků" +msgstr[1] "Obnovit {0} prvků" +msgstr[2] "Obnovit {0} prvků" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1233,37 +1275,32 @@ msgstr "Vrátit zpět poslední vrácenou akci" -#: ../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 "Přejmenovat vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Také přejmenovat soubor" -#: ../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 "Nemohu přejmenovat soubor ''{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 "Otočit cesty" -#: ../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 "Otočit směr všech zvolených cest" -#: ../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 "Zvolte minimálně jednu cestu." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Otočit cesty" @@ -1271,10 +1308,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 "Uložit" #: ../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 "Uložit aktuální data." @@ -1285,36 +1323,25 @@ msgstr "Soubor {0} již existuje. Přepsat ?" -#: ../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 "Nenalezen žádný exportér! Nic nebylo uloženo." -#: ../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 "" -"Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Není otevřený žádný dokument, není co uložit." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Prázdný dokument" -#: ../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 "Dokument neobsahuje žádná data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Přesto uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikty" -#: ../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 " @@ -1324,28 +1351,28 @@ "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Zamítnout konflikty a uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Uložit OSM soubor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Uložit GPX soubor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Ulož vrstvu" +#: ../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 "Uložit jako..." -#: ../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 "Uložit aktuální data do nového souboru" @@ -1380,33 +1407,33 @@ msgstr "Nápověda: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Zpráva o stavu" -#: ../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 "Zkopírovat do schránky a zavřít" -#: ../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 "Zavřít" +#: ../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 "Rozdělit cestu" -#: ../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 "Rozdělit cestu zvoleným uzlem" -#: ../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 "Tento výběr nemůže být použit k rozdělení." -#: ../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." @@ -1415,5 +1442,5 @@ msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty." -#: ../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 " @@ -1426,9 +1453,9 @@ msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu." -#: ../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 "Zvolené uzly nesdílejí stejnou cestu." -#: ../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." @@ -1437,10 +1464,10 @@ msgstr[2] "Označené cesty neobsahují vybrané uzly." -#: ../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 "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty." -#: ../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 " @@ -1450,5 +1477,5 @@ "cesty.)" -#: ../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 " @@ -1456,5 +1483,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 " @@ -1462,8 +1489,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 "Rozdělit cestu {0} do {1} částí" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Zavírám sadu změn..." + +#: ../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 "Zavírám sadu změn..." + +#: ../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 "Otevírám sadu změn..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Zavírám sadu změn..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1481,47 +1533,47 @@ msgstr "Zapnout/Vypnout globální nastavení ''{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 "Rozpojit cesty" -#: ../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 "Zduplikovat uzly používané více cestami." -#: ../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 "Tento uzel není přilepen k ničemu jinému." -#: ../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 "Žádný z těchto uzlů není připojen na něco jiného." -#: ../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 "Žádný z uzlů v této cestě není připojen na něco jiného." -#: ../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 "Tento výběr nelze použít pro oddělení uzlů" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Jeden otagovaný uzel, nebo" -#: ../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 "* Jeden uzel používaný více než jednou cestou, nebo" +#: ../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 "" +"* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" + #: ../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 "" -"* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" - -#: ../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" @@ -1530,5 +1582,5 @@ "nebo" -#: ../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." @@ -1537,5 +1589,5 @@ "cestě." -#: ../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" @@ -1548,9 +1600,9 @@ "své vlastní kopie a všechny uzly budou vybrány." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nespojený uzel" -#: ../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" @@ -1558,5 +1610,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" @@ -1600,61 +1652,71 @@ msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)" -#: ../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 "Aktualizuji data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "Nenalezena aktuální datová sada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Aktualizovat výběr" -#: ../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 "Aktualizovat právě vybrané prvky ze serveru" -#: ../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 "Nejsou vybrány žádné prvky pro aktualizaci." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Prázdný výběr" -#: ../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 "Nahrát do 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 "Nahrát všechy změny na OSM server." -#: ../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 "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Žádné změny k nahrání." -#: ../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 "Synchronizovat pouze {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 "Synchronizovat celý dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1675,17 +1737,17 @@ "pro přerušení a pokračování editace.
" -#: ../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 "Detekován konflikt" #. 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 "Neočekávaná návratová hodnota. Navráceno {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1701,32 +1763,70 @@ "html>" -#: ../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}\"" msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" -#: ../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 "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{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 "Aktualizace selhala.
{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 "Nahrándí do OSM API selhalo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Aktualizuji prvky" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Nahrát tyto úpravy?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Nahrát změny na server" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Upravit novou relaci ve vrstvě \"{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 "Přidat nový uzel do již existující cesty" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "Nahrát všechny změny v jednom požadavku" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1736,31 +1836,83 @@ "prvku samostatně" -#: ../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 "Napište stručný komentář ke změnám, které nahráváte na server:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Nastavení mapy" + +#: ../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 "sada změn" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objekty k přidání:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objekty ke změnění:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objekty ke smazání:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Nahrát tyto úpravy?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Nahrát změny na server" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Nahrávám" +#: ../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] "Objekty k přidání:" +msgstr[1] "Objekty k přidání:" +msgstr[2] "Objekty k přidání:" + +#: ../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] "Objekty ke změnění:" +msgstr[1] "Objekty ke změnění:" +msgstr[2] "Objekty ke změnění:" + +#: ../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] "Objekty ke smazání:" +msgstr[1] "Objekty ke smazání:" +msgstr[2] "Objekty ke smazání:" + +#: ../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 "Poslední změna v {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1784,20 +1936,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 "Zvuk: {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 "Rychleji" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Rychle vpřed" @@ -1839,10 +1991,10 @@ msgstr "Přehrát předchozí značku" -#: ../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 "Pomaleji" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Zpomalené přehrávání" @@ -1871,31 +2023,27 @@ "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}" -#: ../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 "Nic nebylo importováno" -#: ../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 data" -#: ../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 "Stahuji {0} z {1} ({2} zbývá)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Aktualizuji data" - -#: ../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 "Během hromadného stahování došlo k následujícím chybám:{0}" -#: ../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 "Chyby při stahování" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1912,20 +2060,20 @@ "serveru.
Klikněte {2} pro ignorování.
" -#: ../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 "Smazané nebo přesunuté prvky" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Režim mazání" -#: ../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 "Smaž body nebo cesty" -#: ../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 @@ -1934,5 +2082,5 @@ msgstr "Režim: {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 " @@ -1942,55 +2090,69 @@ "když mažete trasu. CTRL: smazat referenční objekty." -#: ../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 "parameter ''{0}'' nesmí být 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 "Kreslit" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Kreslit uzly" -#: ../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 @@ -1998,38 +2160,38 @@ msgstr "vybráno" -#: ../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 "Nemůžu přidat uzel ležící mimo Zemi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Přidat uzel" -#: ../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 "Přidat uzel do cesty" -#: ../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 "Spojit existující cestu do uzlu" -#: ../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 "Přidat nový uzel do již existující cesty" -#: ../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 "Přidat uzel do cesty a spojit" -#: ../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 "Vytvořit nový uzel." -#: ../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 "Vybrat uzel pod kurzorem." -#: ../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." @@ -2039,14 +2201,14 @@ msgstr[2] "Vložit nový uzel do {0} cest." -#: ../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 "Začít novou cestu od posledního uzlu." -#: ../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 "Pokračovat v cestě od posledního uzlu." -#: ../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 "Dokončit kreslení" @@ -2066,5 +2228,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 "Pusť myší tlačítko k vybrání obejktů v obdélníku" @@ -2075,5 +2237,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 "Pusť myší tlačítko k zastavení otaáčení" @@ -2089,17 +2251,18 @@ msgstr "" +#: ../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 "Vybrat" -#: ../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 "Zvol, posuň a otáčej objekty" -#: ../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" @@ -2109,13 +2272,21 @@ msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Přesun prvků" -#: ../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 "Přesunout je" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Vrátit zpět přesun" + +#: ../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 "" @@ -2124,13 +2295,9 @@ "Opravdu je chcete přesunout?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Přesunout je" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Vrátit zpět přesun" - -#: ../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." @@ -2138,5 +2305,5 @@ "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem." -#: ../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-" @@ -2163,62 +2330,62 @@ "nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši" +#: ../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 "Hledat..." -#: ../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 "Hledat objekty." -#: ../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 "Nelze hledat jelikož nejsou nahrána žádná data." -#: ../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 "Zadjte hledaný řetězec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "nahradit označené" -#: ../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 "přidat k výběru" -#: ../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 "odebrat z výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "velikost písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regulární výraz" +#: ../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' a 'Street' v jakémkoliv klíči nebo jménu." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' v jakémkoliv klíči nebo jménu." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' v jakémkoliv klíči nebo jménu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' kdekoliv ve jménu." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2226,112 +2393,113 @@ msgstr "" -#: ../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 - neobsahuje 'Bak' ve jménu." -#: ../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: - klíč 'foot' nastavený na jakoukoliv hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Speciální cíle:" -#: ../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: - typ objektu (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:... - všechny objekty změněné uživatelem" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objekt s daným ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objekt s daným ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt s daným počtem uzlů" -#: ../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 - všechny změněné objekty" -#: ../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 - všechny vybrané objekty" -#: ../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 - všechny nekompletní objekty" -#: ../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 "untagged - všechny objekty bez tagů" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child výraz - všechny podobjekty objektů odpovídajících výrazu" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child výraz - všechny podobjekty objektů odpovídajících výrazu" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent výraz - všechny rodiče objektů odpovídajících výrazu" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent výraz - všechny rodiče objektů odpovídajících výrazu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Použijte | nebo OR ke kombinaci s logickým \"nebo\"" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "Použijte ( a ) k seskupení výrazů" -#: ../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 "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Začít hledání" -#: ../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 "Nebyly nalezeny záznamy pro \"{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 "Nic nebylo přidáno výběrem hledáním \"{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 "Nic nebylo odstraněno výběrem hledáním \"{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 "Nalezeno {0} odpovídajích výrazů" -#: ../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" @@ -2397,58 +2565,96 @@ msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Nahrát výběr" -#: ../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 "Kontakt {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Stahuji..." -#: ../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 "Nemohu číst z URL:\"{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 "Chyba parsování v URL:\"{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 "Chyba při komunikaci se serverem." -#: ../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 "Přidat uzel" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Přidat {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "Změnit {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/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relace: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Sada změn {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Sada změn {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Změnit relaci" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Odstraněno \"{0}\" pro {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Odstraněno \"{0}\" pro {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 "Odstraněno \"{0}\" pro {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Nastaveno {0}={1} pro {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 "Nastaveno {0}={1} pro {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Nastaveno {0}={1} pro {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" @@ -2458,10 +2664,10 @@ msgstr[2] "objekty" -#: ../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 "Odstraněno \"{0}\" pro {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}" @@ -2473,5 +2679,5 @@ msgstr "Změnit roli člena relace {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2480,10 +2686,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 "Dvojí konflikt" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2494,5 +2700,5 @@ "''{1}''" -#: ../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}''" @@ -2516,44 +2722,64 @@ msgstr "nemohu vyřešit nerozhodnutý konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Smazat {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Smazat {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] "Smazat {0} {1}" +msgstr[1] "Smazat {0} {1}" +msgstr[2] "Smazat {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] "Režim mazání" +msgstr[1] "Režim mazání" +msgstr[2] "Režim mazání" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Smazat {0} {1}" +msgstr[1] "Smazat {0} {1}" +msgstr[2] "Smazat {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] "Odstranit z relace" +msgstr[1] "Odstranit z relace" +msgstr[2] "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Konfliktní relace" -#: ../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 "Odstranit z relace" + +#: ../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 "" "Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n" "Smazat z relace?" -#: ../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 "Odstranit z relace" - -#: ../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 "" "Výběr \"{0}\" je používán v relaci \"{1}\".\n" "Smazat z relace?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Rozdělit segment cesty" @@ -2561,6 +2787,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." @@ -2572,5 +2798,5 @@ "
Opravdu je chcete smazat?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Potvrďte smazání" @@ -2581,5 +2807,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2617,10 +2843,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Odstranit člena relace {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" @@ -2634,17 +2870,37 @@ msgstr "Sekvence" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Vyřešit {0} konfliktů v {1} objektech" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Vyřešit {0} konfliktů v {1} objektech" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Vyřešit {0} konfliktů v {1} objektech" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Obnovit {0} prvků" -#: ../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 "Vyřešte konflikt verzí mezi {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Vyřešte konflikt verzí mezi {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Vyřešte konflikt verzí mezi {0} {1}" @@ -2671,13 +2927,13 @@ "jejích bodů, z důvodů udržení konzistence dat?" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Vztah" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Stará role" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nová role" @@ -2696,62 +2952,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 "Nová hodnota" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Použít zvolené změny" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Neprovádět změny" -#: ../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 "Prosím vyberte které změny vlastností chcete použít." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Vlastnosti " -#: ../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 "Role v relaci odkazující na" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Automatická korekce popisků" -#: ../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 "Poškozený konfigurační soubor na řádku {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Nelze otevřít adresář s nastavením: {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 "Soubor s nastavením má chyby. Vytvářím zálohu starého do {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 "Předvolby uloženy na {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 "Nemohu nahrát předvolby. Důvod: {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 "Nemohu nahrát předvolby ze serveru." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2765,29 +3078,36 @@ msgstr "" -#: ../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 "Desetinné stupně" -#: ../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 "Stupně minuty sekundy" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "J" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "Z" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "V" -#: ../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}" @@ -2799,15 +3119,232 @@ msgstr "požadován parametr {0} > 0. Zadáno {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 "nekompletní" - -#: ../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 "Chyba: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Varování: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "V historii není žádný prvek s verzí {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 "V historii není žádná verze platná k datu ''{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 "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "nenalezena starší verze. Historie je prázdná." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "nenalezena novější verze. Historie je prázdná." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "V této datové sadě nelze nalézt prvek s 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 "V této datové sadě nelze nalézt prvek s id {0} a verzí {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 "očekáván parameter ''{0}'' > 0, zadáno ''{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 "nelze porovnat prvky s id ''{0}'' a 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 "parameter {0} není v rozsahu 0..{1}, zadáno {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Cesta se stylem plochy není uzavřená." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Cesta v multipolygonu ''{0}'' není uzavřena." + +#. 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 "Prázdný prvek v relaci." + +#: ../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 "Odstraněn prvek ''{0}'' z relace." + +#: ../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 "Cesta ''{0}'' s méně, než dvěmi body." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Nalezena více než jedna \"from\" cesta." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Nalezeno více cílových \"to\" cest." + +#: ../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 "Nalezen více než jeden \"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 "Neznámá role ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Neznámý typ prvku pro ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Nenazezena příchozí cesta \"from\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Nenalezena odchozí cesta \"to\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Nenalezen \"via\" uzel nebo cesta." + +#: ../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 "Cesta \"from\" nezačíná, ani nekončí v uzlu \"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 "Cesta \"to\" nezačíná nebo nekončí v uzlu \"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 "Cesta \"from\" nezačíná nebo nekončí v uzlu \"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 "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Styl pro omezení {0} nenalezen." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Ne-cesta ''{0}'' v multipolygonu." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Cesty ''{0}'' a ''{1}'' se protínají." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Vnitřní cesta ''{0}'' je venku." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Styl pro vnější cestu ''{0}'' nesedí." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "nepopsaný" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "text" + +#. 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 "" +"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší " +"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj " +"prvek. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "neaktivní" + #: ../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" @@ -2817,22 +3354,7 @@ msgstr[2] "uzly" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Chyba: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Varování: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "body" - -#: ../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" @@ -2842,12 +3364,7 @@ msgstr[2] "cestami" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "cesty" - -#: ../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" @@ -2857,251 +3374,4 @@ msgstr[2] "relace" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "vazby" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "sada změn" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "sady změn" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} prvek" -msgstr[1] "{0} prvky" -msgstr[2] "{0} prvků" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "silnice" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "železnice" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vodní tok" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "využití oblasti (landuse)" - -#: ../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} uzel" -msgstr[1] "{0} uzly" -msgstr[2] "{0} uzlů" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "V historii není žádný prvek s verzí {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 "V historii není žádná verze platná k datu ''{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 "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "nenalezena starší verze. Historie je prázdná." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "nenalezena novější verze. Historie je prázdná." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "V této datové sadě nelze nalézt prvek s 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 "V této datové sadě nelze nalézt prvek s id {0} a verzí {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 "očekáván parameter ''{0}'' > 0, zadáno ''{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 "nelze porovnat prvky s id ''{0}'' a 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 "parameter {0} není v rozsahu 0..{1}, zadáno {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Cesta se stylem plochy není uzavřená." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Cesta v multipolygonu ''{0}'' není uzavřena." - -#. 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 "Prázdný prvek v relaci." - -#: ../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 "Odstraněn prvek ''{0}'' z relace." - -#: ../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 "Cesta ''{0}'' s méně, než dvěmi body." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Nalezena více než jedna \"from\" cesta." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Nalezeno více cílových \"to\" cest." - -#: ../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 "Nalezen více než jeden \"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 "Neznámá role ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Neznámý typ prvku pro ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Nenazezena příchozí cesta \"from\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Nenalezena odchozí cesta \"to\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Nenalezen \"via\" uzel nebo cesta." - -#: ../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 "Cesta \"from\" nezačíná, ani nekončí v uzlu \"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 "Cesta \"to\" nezačíná nebo nekončí v uzlu \"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 "Cesta \"from\" nezačíná nebo nekončí v uzlu \"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 "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Styl pro omezení {0} nenalezen." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Ne-cesta ''{0}'' v multipolygonu." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Cesty ''{0}'' a ''{1}'' se protínají." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Vnitřní cesta ''{0}'' je venku." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Styl pro vnější cestu ''{0}'' nesedí." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "nepopsaný" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "text" - -#. 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 "" -"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší " -"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj " -"prvek. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "neaktivní" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3114,5 +3384,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "pozadí" @@ -3122,5 +3392,5 @@ msgstr "zvýraznit" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "WGS84 Geographic" @@ -3130,5 +3400,5 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3145,21 +3415,21 @@ "kartografické projekce.." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambertova zóna (Francie)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambertova zóna (Estonsko)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercatorova projekce" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Švýcarský Grid" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3179,9 +3449,9 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, java-format -msgid "Could not read bookmarks.
{0}" +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "Nelze načíst záložky.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3189,17 +3459,105 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Znovu nezobrazovat" -#: ../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/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 "nekompletní" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "silnice" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "železnice" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vodní tok" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "využití oblasti (landuse)" + +#: ../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} uzel" +msgstr[1] "{0} uzly" +msgstr[2] "{0} uzlů" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} prvek" +msgstr[1] "{0} prvky" +msgstr[2] "{0} prvků" + +#: ../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 "" "Selhalo navázání komunikace s OSM serverem {0}.\n" "Zkontrolujte URL serveru v nastavení a vaše připojení k internetu." -#: ../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 "neznámý" + +#: ../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 "" @@ -3212,36 +3570,9 @@ "html>" -#: ../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 "neznámý" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3251,9 +3582,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "Bezpečnostní vyjímka" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3264,9 +3595,9 @@ "prověřte funkčnost internetového připojení." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "Síťová vyjímka" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3277,9 +3608,20 @@ "problémům s přenosem dat.
Detaily(nepřeloženo): {1}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 msgid "IO Exception" msgstr "IO výjimka" -#: ../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 "" @@ -3292,9 +3634,9 @@ "vaše internetové připojení." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Neznámé jméno počítače" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3306,12 +3648,7 @@ "již na serveru vymazán.

Chybová zpráva je:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Prvek byl již smazán" - -#: ../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 @@ -3328,38 +3665,38 @@ msgstr "Stahuji zprávu dne" -#: ../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 "Nahrát nastavení" -#: ../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 "Nahrát současné nastavení na server" -#: ../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 "řetězec" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Jméno uživatele." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Heslo 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 "Změnit velkost appletu (formát: ŠÍŘKAxVÝŠKA)" -#: ../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 "řetězec;řetězec;..." -#: ../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 " @@ -3369,5 +3706,5 @@ "nebo název souboru." -#: ../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 " @@ -3377,5 +3714,5 @@ "at=y&lon=x&zoom=z nebo název souboru." -#: ../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 " @@ -3385,75 +3722,94 @@ "jako na Googlu nebo URL vracející osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "cokoliv" -#: ../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 "Pokud je nastaveno, smaže se konfigurace, místo jejího načtení" -#: ../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 "Jméno uživatele" -#: ../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 "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "použití" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Zobrazí tuto nápovědu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standardní unixová geometrie okna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Stáhnout ohraničující box" -#: ../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 "Stáhnout umístění s url (obsahující 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 "Otevřít soubor (jako GPS trasu, pokud .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 "Stáhnout ohraničenou oblast jako \"raw\" GPS data" -#: ../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 "Spustit přes celou obrazovku" -#: ../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 "Nastavit výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Nastavit jazyk." -#: ../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 "příklady" -#: ../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" @@ -3463,47 +3819,47 @@ "selection nejprve nahrajte nějaká data." -#: ../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 "Namísto --download= můžete zadat 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 "Aktivuji aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Načítám dřívější pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Nastavuji výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Načítám pluginy" -#: ../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." msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Soubor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Nástroje" -#: ../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 "Předvolby" -#: ../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 @@ -3515,21 +3871,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 "Drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Přepnout drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Zvuk" @@ -3569,59 +3925,45 @@ msgstr "Oddálit" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "měřítko" -#: ../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 "Zeměpisná délka na místě kurzoru myši." -#: ../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 "Jméno objektu na místě kurzoru myši." -#: ../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 "Zeměpisná šířka na místě kurzoru myši." -#: ../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 "Úhel mezi předchozím a současným úsekem cesty." -#: ../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 "Délka nového nakresleného segmentu trasy." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(žádný objekt)" -#: ../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 "vrstva není v seznamu" -#: ../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 "Vrstva ''{0}'' musí být v seznamu vrstev" - -#: ../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 @@ -3632,10 +3974,4 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" - -#: ../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 @@ -3694,7 +4030,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" @@ -3710,5 +4045,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" @@ -3811,5 +4146,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 "Má verze" @@ -3820,5 +4155,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" @@ -3832,5 +4167,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 "Cizí verze" @@ -3912,6 +4247,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" @@ -4028,10 +4363,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 "neočekávaný index sloupce. Zadáno {0}" -#: ../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 "" @@ -4040,19 +4375,19 @@ msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" -#: ../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 "Komunikace se serverem selhala" -#: ../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 "Ano, obnovit je také" -#: ../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 "Ne, zruš operaci" -#: ../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 "" @@ -4063,5 +4398,5 @@ "serveru.

Chcete obnovit také tyto body?" -#: ../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 "Obnovit další body?" @@ -4081,9 +4416,9 @@ msgstr "Obnovit závislé prvky?" -#: ../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 "Vlastnosti v mé datové sadě, např lokální datové sadě" -#: ../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 " @@ -4093,95 +4428,97 @@ "sloučení aplikováno." -#: ../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 "Vlastnosti v cizí datové sadě, např serverová datová sada" -#: ../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 "Souřadnice:" -#: ../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 "Stav smazáno:" -#: ../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 "Stav viditelné:" -#: ../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 "(žádný)" -#: ../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 "smazáno" -#: ../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 "nesmazáno" -#: ../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 "viditelný (na serveru)" -#: ../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 "neviditelný (na serveru)" -#: ../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 "Ponechat klon lokální verze" -#: ../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 "Fyzicky odstranit z lokální datové sady" -#: ../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 "Ponechat mé souřadnice" -#: ../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 "Ponechat cizí souřadnice" -#: ../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 "Nerozhodnutý konflikt rozdílných souřadnic" -#: ../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 "Ponechat můj stav vymazáno" -#: ../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 "Ponechat cizí stav vymazáno" -#: ../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 "Nerozhodnutý konflikt stavu vymazáno" -#: ../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 "Ponechat můj stav viditelné" -#: ../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 "Ano, resetovat 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 "Ne, zrušit" -#: ../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 "" "Pro ponechání vaší lokální verze, JOSM
resetuje id {0} {1} na 0." @@ -4189,17 +4526,17 @@ "
Souhlasíte s tím?" -#: ../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 "Resetovat id na 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 "Ponechat cizí stav viditelné" -#: ../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 "Ano, vyčistit to" -#: ../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 "" @@ -4210,21 +4547,21 @@ "html>" -#: ../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 "Odstranit z datové sady" -#: ../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 "Nerozhodnutý konflikt stavu viditelné" #: ../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 "Role" #: ../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 "Prvek" @@ -4263,10 +4600,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 @@ -4275,10 +4613,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 @@ -4292,5 +4631,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}" @@ -4331,4 +4670,144 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Cizí datová sada neobsahuje tag s klíčem {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 "nic" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "všechny" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Zvolit barvu" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parameter ''{0}'' nesmí být 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 "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {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 "nesmazáno" + +#: ../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 "Zatím neimplementováno." + +#: ../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 "z cesty" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikty v datech" + +#: ../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} cesta" +msgstr[1] "{0} cesty" +msgstr[2] "{0} cest" + +#: ../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} relace" +msgstr[1] "{0} relace" +msgstr[2] "{0} relací" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Řešení konfliktů" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Vyřešit konflikty" + +#: ../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 "Aplikovat" + +#: ../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 "Vložit" + +#: ../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} začátek" +msgstr[1] "{0} začátek" +msgstr[2] "{0} začátek" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4344,10 +4823,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 @@ -4355,5 +4834,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}" @@ -4386,36 +4865,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 "Zrušit řešení konfliktu a zavřít dialog" -#: ../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 "Aplikovat řešení konfliktů a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Aplikovat řešení" -#: ../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 "Pokračovat v řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4427,150 +4900,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 "Konflikt není vyřešen kompletně" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Vyřešit konflikty" -#: ../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 "Vyřešit konflikty pro ''{0}''" -#: ../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 "Historie" -#: ../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 "Zobrazit historii všech zobrazených objektů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{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 "" -#: ../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 "Bod {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 "Vrstva: {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 "Relace: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Položka historie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Nahrát hostorii" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Nahrávám historii pro {0} s 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 "Znovu nahrát vybrané objekty a obnovit seznam." #. 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 "Zobrazit" -#: ../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 "Zobrazit historii vybraného prvku" -#: ../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 "Vrstvy" -#: ../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 "Otevřít seznam všech nahraných vrstev." -#: ../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 "Smazat označenou vrstvu." -#: ../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 "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -msgid "Delete Layer" -msgstr "Smazat vrstvu" - -#: ../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 "Opravdu chcete smazat vrstvu ''{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 "Potvrzení" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "Ano" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "Ne" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Smazat vše" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "Mazání vrstvy {0} z {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Zobrazit/Skrýt" -#: ../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 "Přepnout viditelnost zvolené vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "Aktivovat" -#: ../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 "Aktivovat vybranou vrstvu" -#: ../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 "Sloučit tuto vrstvu do jiné vrstvy" -#: ../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 "Přesunout zvolenou vrstvu o řádek nahoru." -#: ../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 "Přesunout zvolenou vrstvu o řádek dolů." -#: ../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 "Informace o vrstvě" -#: ../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." @@ -4580,28 +5021,22 @@ msgstr[2] "Toto změní až {0} objektů." -#: ../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 "Prázdná hodnota smaže klíč" -#: ../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 "Změnit hodnoty ?" -#: ../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" @@ -4611,89 +5046,84 @@ msgstr[2] "Změnit vlastnosti až {0} objektů." -#: ../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 "Prosím zvolte klíč" -#: ../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 "Vyberte prosím hodnotu" -#: ../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 "Vyberte objekty, u kterých chcete změnit vlastnosti." -#: ../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 "Vlastnosti/Členství" -#: ../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 "Vlastnosti pro zvolené objekty" #. 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 "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../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 "Přidat" -#: ../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 "Přidat nový pár klíč/hodnota ke všem objektům" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Upravit vlastnosti" -#: ../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 "Změnit hodnotu zvoleného klíče pro všechny objekty" -#: ../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 "Vlastnosti: {0} / Členství: {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 "Vlastnosti / Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Změnit relaci" -#: ../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 "Opravdu smazat výběr z relace {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 "Smaže zvolený klíč ve všech objektech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Smazat vlastnosti" @@ -4702,34 +5132,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 "Relace" -#: ../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 "Otevřít seznam všech relací" -#: ../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 "Relace: {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 "Otevřít editor pro zvolenou relaci" -#: ../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 "Smazat vybrané relace" -#: ../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 "Vytvořit novou relaci" -#: ../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 "Vytvořit kopii relace a otevřít ji v novém okně" @@ -4762,25 +5192,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 "Výběr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} cesta" -msgstr[1] "{0} cesty" -msgstr[2] "{0} cest" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relace" -msgstr[1] "{0} relace" -msgstr[2] "{0} relací" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4788,14 +5202,9 @@ msgstr "Výběr: {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 "Vytrhnout panel" -#: ../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." @@ -4804,64 +5213,101 @@ "nástrojů." -#: ../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 "Minimalizovat nebo maximalizovat obsah panelu" -#: ../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 "Autoři" -#: ../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 "Otevřít seznam lidí, kteří pracuji na zvoleném objektu" -#: ../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] "Autor" +msgstr[1] "Autor" +msgstr[2] "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +#, fuzzy +msgid "Select primitives submitted by this user" +msgstr "Vybrat prvky pro vybrané členy relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Zobrazit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Více informací o tomto přednastavení" + +#: ../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 "" +"UPOZORNĚNÍ: Otevírám okno prohlížeče pouze pro první {0} z {1} vybraných " +"primitiv." + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autoři: {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 "Upravit relaci na kterou odkazuje vybraný člen" -#: ../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 "Stáhnout všechny potomky relace (rekurzivně)" -#: ../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 "Stáhnout všechny potomky" -#: ../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 "Stáhnout vybrané relace" -#: ../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 "Stáhnout vybrané potomky" -#: ../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 "Stáhnout členy relace" -#: ../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 "Konflikty v datech" -#: ../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 "" @@ -4871,47 +5317,41 @@ "Potomek relace
{0}
byl smazán na serveru. Nemůže být stažen" -#: ../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 "Relace je smazána" -#: ../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 "Stahování relace {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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 "Značky a Členové" -#: ../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 "Rodičovské relace" -#: ../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 "Potomci relace" -#: ../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 "Role:" -#: ../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 " @@ -4923,14 +5363,14 @@ "provést s touto cyklickou závislostí?" -#: ../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 "Odstranit, vyčistit relaci" -#: ../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 "Ignorovat, ponechat relaci jak je" -#: ../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 "" @@ -4942,9 +5382,9 @@ "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../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 "Více členů odkazuje na stejný prvek" -#: ../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 "" @@ -4957,10 +5397,10 @@ "html>" -#: ../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" msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" -#: ../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" @@ -4968,5 +5408,5 @@ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena" -#: ../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 " @@ -4976,5 +5416,5 @@ "člena" -#: ../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 " @@ -4984,20 +5424,20 @@ "člena" -#: ../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 "Odstranit všechny členy odkazující na některý z vybraných prvků" #. 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 "Editor relací: Odstranit vybrané" -#: ../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 "Vybrat členy relace odkazující na prvky v aktuálním výběru" -#: ../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 "" @@ -5006,57 +5446,57 @@ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru" -#: ../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 "Vybrat prvky pro vybrané členy relace" -#: ../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 "Seřadit členy relace" #. 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 "Přesunout zvolené členy nahoru" #. 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 "Přesunout zvolené členy dolů" #. 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 "Odstranit vybrané členy z relace" #. 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 "Editor relací: Odstranit" -#: ../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 " @@ -5065,9 +5505,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 "Konflikt v datech" -#: ../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 "" @@ -5076,20 +5516,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 "Aplikovat aktuální změny" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "Aplikovat" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Aplikovat změny a zavřít dialog" -#: ../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 @@ -5099,37 +5535,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 "Zrušit změny a zavřít dialog" -#: ../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 "Přidat prázdnou značku" -#: ../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 "Smazat vybrané značky" -#: ../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 "Stáhnout všechny nekompletní cesty a uzly v relaci" -#: ../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 "Stáhnout prvky" -#: ../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 "Editor relací: Stáhnout členy" -#: ../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 "Nastaví roli pro vybrané členy" -#: ../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 "Aplikovat roli" -#: ../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 "" @@ -5141,30 +5577,30 @@ "role těchto prvků.
Opravdu chcete novou roli aplikovat?" -#: ../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 "Ano, aplikovat" -#: ../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 "Ne, neaplikovat" -#: ../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 "Potvrdit prázdnou roli" -#: ../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 "Zvětšit na" -#: ../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 "Zvětšit na prvek odkazovaný prvním členem výběru" -#: ../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 "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací" -#: ../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 "Zvětšování je neaktivní protože nebyl vybrán žádný člen" @@ -5178,22 +5614,27 @@ msgstr "Spojený" -#: ../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 "Stáhnout odkazované relace" -#: ../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 "včetně přímých potomků rodičovské relace" -#: ../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 "Načíst rodičovské relace" -#: ../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 "Načíst rodičovské relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "Upravit vybranou relaci" @@ -5226,35 +5667,21 @@ msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: " -#: ../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] "Odstranit staré klíče z {0} objektů" -msgstr[1] "Odstranit staré klíče z {0} objektu" -msgstr[2] "Odstranit staré klíče z {0} objektů" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Záložky" -#: ../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 "Prosím zadejte nejdříve pozadovanou pozici" -#: ../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 "Prosím zadejte jméno umístění" -#: ../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 "Jméno lokace" -#: ../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 "Nejdříve zvolte záložku" @@ -5308,13 +5735,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 "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy." -#: ../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 "Prosím, zadejte hledaný řetězec" -#: ../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 "Nemohu načíst výsledky hledání ze serveru" @@ -5322,18 +5749,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 "Zadej jméno místa které chceš najít:" -#. 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 "Místa" #. 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 "jméno" @@ -5372,37 +5798,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 "typ" -#: ../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 "poblíž" -#: ../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 "Zvětšení" -#: ../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: " @@ -5414,5 +5840,5 @@ "b> Klik." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Aktuální mapa" @@ -5439,47 +5865,75 @@ msgstr "Čísla dlaždic" -#: ../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 "Historie pro {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 "Historie pro {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historie pro {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Zavřít dialog" -#: ../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 "Zobrazit historii vybraného prvku" + +#: ../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 "Bod {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Nahrát hostorii" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Nahrávám historii pro {0} s id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Nahrávám historii pro {0} s id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Nahrávám historii pro {0} s id {1}" #. item "Streets/Motorway" text "Reference" @@ -5797,14 +6251,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5980,8 +6448,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" #. @@ -6078,4 +6552,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6189,6 +6666,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 @@ -6196,156 +6673,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 "Název" -#: ../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 "" "Verze {0} vytvořená na {1} " "uživatelem {2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Sada změn {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Více informací o tomto přednastavení" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Sada změn {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6353,32 +6848,290 @@ msgstr "Verze {0} vytvořená na {1} uživatelem {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Verze" -#: ../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 "Jméno ulice" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Ano" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Ne" + +#: ../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 "Vyberte prosím hodnotu" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Vrstva ''{0}'' musí být v seznamu vrstev" + +#: ../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 "Opravit konflikty značek" + +#: ../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 "Neuložit změny a ukončit" + +#: ../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 "Uložit a ukončit" + +#: ../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 "Vrstva" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Při nahrávání" + +#: ../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 "Soubor" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Nahrávám" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Nejsou vybrány žádné prvky pro aktualizaci." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Obrázky pro {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 "Číst 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 "Žádný čas pro bod {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 "Nelze přečíst čas \"{0}\" z bodu {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 "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." -#: ../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 @@ -6386,29 +7139,29 @@ msgstr "Čtu {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 "Obrázky s GPS souřadnicemi" -#: ../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 "Start 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 "Konec 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 "nynější odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "rozdíl časových pásem: " -#: ../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" @@ -6418,14 +7171,14 @@ msgstr[2] "obrázky" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synchronizovat hodiny" -#: ../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 @@ -6433,82 +7186,82 @@ msgstr "JPEG obrázky (*.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 "Data v souboru \"{0}\" nemohla být parsována." -#: ../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 "V souboru \"{0}\" není časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Obrázek" -#: ../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 "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" -#: ../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 "časové pásmo GPS jednotky (rozdíl oproti forografii)" -#: ../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 "Synchronizace času s GPS přijímačem" -#: ../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 "Zadaný čas nemůže být rozparsován" -#: ../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 bod" -#: ../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 "Přizpůsobit kreslení linií" +#: ../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 "Použít globální nastavení." + #: ../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 "Použít globální nastavení." +msgid "Draw lines between points for this layer." +msgstr "Kreslit spojnice mezi body v této vrstvě" #: ../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 "Kreslit spojnice mezi body v této vrstvě" - -#: ../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 "Nereslit spojnice mezi body v této vrstvě" -#: ../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 "Přizpůsobit barvu" -#: ../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 "Výchozí" -#: ../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" @@ -6571,5 +7324,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}" @@ -6585,10 +7338,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 "Převést do datové vrstvy" #: ../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." @@ -6599,11 +7352,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 @@ -6645,4 +7398,9 @@ "pokračovat?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Stahuji data" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6663,64 +7421,64 @@ "byly vynechány." -#: ../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 "Datová vrstva {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 "mimo stažený areál" -#: ../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 "verze {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 "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 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} se skládá z:" -#: ../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} smazáno.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "nenastaveno" -#: ../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 "Verze 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 "Převédst do GPX vrstvy" -#: ../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" @@ -6729,5 +7487,5 @@ msgstr[2] "trasy" -#: ../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" @@ -6736,5 +7494,5 @@ msgstr[2] "body" -#: ../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" @@ -6744,5 +7502,5 @@ msgstr[2] "trasy s {0} body" -#: ../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" @@ -6752,5 +7510,5 @@ msgstr[2] "{0} se skládá z {1} tras" -#: ../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" @@ -6760,9 +7518,9 @@ msgstr[2] "{0} bodů" -#: ../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 značka" -#: ../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" @@ -6771,5 +7529,5 @@ msgstr[2] "značky" -#: ../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" @@ -6790,5 +7548,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}." @@ -6796,5 +7554,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 "Není možno synchronizovat v již přehrávané vrstvě" @@ -6822,5 +7580,5 @@ msgstr "Přepnout viditelnost textu značek a ikon." -#: ../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 " @@ -6828,5 +7586,5 @@ msgstr "" -#: ../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 " @@ -6834,29 +7592,29 @@ msgstr "" -#: ../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 "Není možné vztvořit novou zvukovou značku" -#: ../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 "Při pokusu o zobrazení URL pro tuto značku došlo k chybě" -#: ../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 "(URL bylo: " -#: ../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 "Chyba při zobrazování 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 "Pokročilé volby" -#: ../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 "Ruční nastavení. Používejte s opatrností!" -#: ../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 @@ -6864,26 +7622,26 @@ msgstr "Hledání: " -#: ../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 "Nynějsí hodnota je výchozí" -#: ../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 "Výchozí hodnota je''{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 "Výchozí hodnota není známa ( ještě nebyla definována )" -#: ../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 "Zvolte řádek k editaci" -#: ../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 @@ -6891,14 +7649,14 @@ msgstr "Nová hodnota pro {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 "Zvolte řádek k vymazání" -#: ../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 "Zadejte novou dvojici klíč/hodnota" @@ -7021,40 +7779,40 @@ msgstr "Kalibrace nahrávání zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Barva" -#: ../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 "Styl kreslení {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 "Vrstva: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Vybrat" -#: ../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 "Zvolte barvu pro {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 "Nastavit na výchozí hodnotu" -#: ../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 "Nastavit vše na výchozí hodnoty" -#: ../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 "Barvy použité různými objekty v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Barvy" @@ -7099,5 +7857,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Auto" @@ -7119,16 +7877,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 "Cyklisté" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7158,12 +7917,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 "Pěší" @@ -7341,5 +8100,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 "Zobrazovat při startu úvodní obrazovku" @@ -7347,23 +8106,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 "Zobrazovat ID objektů v seznamech" #: ../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 "Zobrazovat ID objektů v seznamech" + +#: ../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 "Vykreslovat pomocnou čáru od posledního bodu." -#: ../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 "Nepoužívat módy (styl Potlachu)" -#: ../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 "Zobrazovat ID objektů v seznamech" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Práce bez přepínání režimů (ve stylu potlatche)" -#: ../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 "Vzhled a chování" @@ -7395,54 +8165,54 @@ msgstr "Použitý styl" -#: ../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 "Nastavení dostupných pluginů." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Stáhnout seznam" -#: ../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 "Aktualizovat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Konfigurovat zařízení..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "Zadat URL" -#: ../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 "Prosím, vyberte položku." +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Nastavení webů s pluginy" #. 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 "Nastavení zobrazení" -#: ../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 " @@ -7450,41 +8220,41 @@ msgstr "Různá nastavení ovlivňující vzhled celého programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Nastavení připojení" -#: ../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 "Nastavení připojení pro OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Nastavení mapy" -#: ../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 "Nastavení projekce mapy a interpretace dat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Nastavení zvuku" -#: ../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 "Nastavení pro přehrávání zvuků a zvukové značky." -#: ../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 "Některá nastavení se projeví až po restartování 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 "Zobrazovat souřadnice jako" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Metoda projekce" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Projekce mapy" @@ -7517,12 +8287,4 @@ msgid "Proxy server password" msgstr "Heslo pro proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Základní URL OSM serveru (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL serveru" #. 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 @@ -7549,61 +8311,60 @@ msgstr "Klávesová zkratka" -#: ../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 "Krátká popiska: {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 "Autor: {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 "Webová stránka: {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 "Verze: {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 "Cesty k ikonám" -#: ../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 "Vyberte řádek ke zkopírování." -#: ../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 "XML zdroj (URL nebo název souboru) pro {0} definiční soubory." -#: ../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 "Pridat do seznamu nový XML zdroj." -#: ../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 "Smazat vybraný zdroj ze seznamu." -#: ../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 "" @@ -7771,36 +8532,60 @@ msgstr "Skupiny modifikátorů" -#: ../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] "Odstranit staré klíče z {0} objektů" +msgstr[1] "Odstranit staré klíče z {0} objektu" +msgstr[2] "Odstranit staré klíče z {0} objektů" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Přidat novou vrstvu" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Smazat označenou vrstvu." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Více informací o tomto přednastavení" #. 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 "Volitelné atributy:" -#: ../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 "Použít přednastavení \"{0}\" ze skupiny \"{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 "Použít přednastavení \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "uzavřená cesta" -#: ../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 "Neznámý typ: {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 @@ -7808,15 +8593,15 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {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 "Chyba parsování {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 "Objekty typu {0} nejsou podporovány." -#: ../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 @@ -7827,22 +8612,22 @@ msgstr[2] "Změnit {0} objektů" -#: ../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 "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Změnit vlastnosti" -#: ../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}''" @@ -7881,11 +8666,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 "Nemůžu číst \"{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 " @@ -7895,38 +8680,38 @@ "licencované pod 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 "GPX soubory" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "popis gps trasy" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Přidat informace autora" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Skutečné jméno" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "Email" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Předdefinováno" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Klíčová slova" @@ -7936,9 +8721,9 @@ msgstr "Nastavení Exportu" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportovat a uložit" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7949,10 +8734,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 "Zvolte předdefinovanou licenci" -#: ../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 @@ -7962,12 +8747,12 @@ msgstr "Značky z {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 "Soubor \"{0}\" neexistuje" -#: ../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" @@ -7989,6 +8774,6 @@ "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku" -#: ../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 @@ -7998,20 +8783,40 @@ msgstr "Stahuji OSM data..." -#: ../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 "Upravit relaci #{0} ve vrstvě \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Pro id {0} server odpověděl kódem 404. Přeskakuji." -#: ../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 "Nic nebylo přidáno výběrem hledáním \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8021,34 +8826,34 @@ "pro každý prvek" -#: ../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 soubory" -#: ../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 "Importované souřadnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Poškozené věty: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Chyby v kontrolním součtu: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Neznámé věty: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Nulové souřadnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA import úspěšný" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA import selhal!" @@ -8059,9 +8864,9 @@ msgstr "" -#: ../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 "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8072,15 +8877,15 @@ "{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 "Komunikace s {0} zahájena za použití protokolu verze {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 "neočekávaný formát id získaný ze serveru, získáno ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8089,33 +8894,91 @@ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{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 "Otevírám sadu změn..." -#: ../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 "Otevírám sadu změn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Otevírám sadu změn..." + +#: ../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 "Otevírám sadu změn..." + +#: ../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 "Zavírám sadu změn..." -#: ../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 "Zavírám sadu změn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Otevírám sadu změn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Nahrávám..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, fuzzy, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "Zahajuji pokus {0} z {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../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}." @@ -8143,29 +9006,33 @@ msgstr "poškozený bz2 soubor." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Nesprávné heslo nebo uživatelské jméno" -#: ../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 "Upozornění: heslo je posíláno nezašifrované." -#: ../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 "Uložit uživatelské jméno a heslo (nezašifrované)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Zadejte heslo" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Přihlásit se" -#: ../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 "Základní URL OSM serveru (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Přihlašovací jméno (e-mail) k účtu 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." @@ -8173,13 +9040,17 @@ "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL serveru" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "Uživatelské jméno (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 heslo" -#: ../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." @@ -8191,20 +9062,20 @@ "
Nepoužívejte hesla která chcete utajit." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Soubory z OSM serveru" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "Při ukládání došlo k chybě.
Chyba:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8214,5 +9085,5 @@ "Došlo k chybě při obnovování zálohy souboru.
Chyba:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8414,35 +9285,46 @@ "internetu." -#: ../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}), zbývá {3} . Nahrávám {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}), zbývá {3} . Nahrávám {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}), zbývá {3} . Nahrávám {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 "Není nic k nahrání. Nejprve musíte mít nějaká data." + +#: ../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 "Aktualizuj pluginy" -#: ../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 "Stáhnout pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8455,5 +9337,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." @@ -8463,23 +9345,23 @@ msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte 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 "Stahuji Plugin {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Přeskočit stahování" -#: ../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 "Pro plugin {1} je třeba JOSM verze {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Stáhnout Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Přeskočit stahování" @@ -8490,30 +9372,30 @@ msgstr "Nastala chyba v pluginu {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 "Plugin {0} požaduje aktualizaci JOSM na verzi {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 "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen." -#: ../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 "Následující plugin nenalezen:{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 "Pluginy byly naposledy aktualizovány před {0} dny." -#: ../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 " @@ -8523,21 +9405,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 "Zakázat plugin" -#: ../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 "Nemohu nahrát plugin {0}. Odstranit z nastavení?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Ponechat plugin" -#: ../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 " @@ -8547,5 +9429,5 @@ "jejich přepsání." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8554,10 +9436,10 @@ "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{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 "Dle informací z pluginu je autor {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." @@ -8565,9 +9447,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu." -#: ../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 "Chcete plugin zakázat ?" -#: ../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 " @@ -8577,13 +9459,13 @@ "programu." -#: ../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 "Plugin nelze odstranit. Pravděpodobně je již neaktivní." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "Informace o pluginu" -#: ../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" @@ -8594,5 +9476,5 @@ msgstr "Více detailů" -#: ../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" @@ -8602,18 +9484,18 @@ msgstr[2] "Informace o pluginech staženy z {0} sití" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Nenalezeny informace o pluginu" -#: ../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 "Plug-in {0} je nedostupný. Aktualizace přeskočena." -#: ../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 "Všechny nainstalované pluginy jsou aktuální." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8626,9 +9508,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 "Stáhnout chybějící pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8641,35 +9523,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}: Verze {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 "Plugin zahrnut v 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 "Chyba čtení souboru informací o pluginu: {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 "Toto je až za koncem nahrávky" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Chyba přehrávání zvuku" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Nedělat nic" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Nahlásit chybu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8683,18 +9565,18 @@ "verzi JOSM, buďte tak laskavi a chybu nahlašte." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Neočekávaná výjimka" -#: ../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 "Prosíme oznamte chybu na {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 "Popište (detailně) kroky, které vedly k chybě." -#: ../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 " @@ -8703,19 +9585,19 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby." -#: ../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 "Prosíme, připojte následující informace:" -#: ../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 "(Text již byl zkopírován do schránky.)" -#: ../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 "Nelze najít překlad pro jazyk {0}. Vracím se k {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 "" @@ -8724,5 +9606,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8731,5 +9613,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8742,5 +9624,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" @@ -8750,5 +9632,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8759,21 +9641,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 "(Tip: Klávesové zkratky lze změnit v nastavení.)" -#: ../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 "" @@ -8800,9 +9717,27 @@ msgstr "Vytvořit mřížku cest" -#: ../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 "Nahrát trasy" -#: ../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 @@ -8810,27 +9745,40 @@ msgstr "Nahrát trasy na server" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Veřejné" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Při zvolení budou vaše trasy veřejné na 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 "Popis" -#: ../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 "Prosím zadejte popis vaší trasy" -#: ../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 "Prosím zadejte tagy o vaší trase" -#: ../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}" @@ -8838,47 +9786,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 "Připojuji se..." -#: ../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 "Nahrávání přerušeno" -#: ../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 "Chyba při nahrávání na server" -#: ../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 "Nahrání GPX dat na server proběhlo úspěšně" -#: ../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 "Nahrávání selhalo. Server vrátil následující chybu: " -#: ../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 "Nahrávám GPX trasu: {0}% ({1} z {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 "Není zadán žádný popisek. Prosíme, zadejte jej." -#: ../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 "Není vybrána GPX vrstva. Nelze nahrát trasu na server." -#: ../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 "Není zadáno uživatelské jméno." -#: ../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 "Není zadáno heslo." -#: ../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 "Nahrávám GPX trasu na server" @@ -8991,19 +9939,19 @@ msgstr "Otevřít skupinu obrázků jako novou vrstvu." -#: ../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 "Soubory 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 "Soubor {0} je načten pod jménem \"{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 "Chyba při parsování {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." @@ -9015,34 +9963,34 @@ "pásmo
" -#: ../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 "Čas fotografie (z 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 "Čas GPS (načten z předchozích fotografií): " -#: ../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 " [dd/mm/rrrr hh:mm:ss]" -#: ../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 "Jsem v časovém pásmu: " -#: ../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 "Žádné datum" -#: ../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 "Otevřít další fotografie" -#: ../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 "Synchronizovat čas z fotografie GPS přijímače" -#: ../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" @@ -9052,69 +10000,69 @@ "Prosíme, použijte požadvaný formát" -#: ../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 "Neplatné datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 trasa: " -#: ../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 "Otevřít jinou GPX trasu" -#: ../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 "Časové pásmo: " -#: ../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 "Posun:" -#: ../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 "Mohu vyfotit můj GPS přijímač.
Může to pomoci?" -#: ../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 "Aktualizovat pozici pro: " -#: ../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 "Všechny obrázky" -#: ../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 "Obrázky bez exif pozice" -#: ../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 "Neotagované obrázky" -#: ../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 "Korelovat obrázky s GPX trasou" -#: ../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 "Korelovat" -#: ../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 "Auto-odhad" -#: ../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 "Měli byste vybrat GPX trasu" -#: ../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 "Není vybrána GPX trasa" -#: ../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 "" @@ -9125,9 +10073,9 @@ "Očekávaný formát: {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 "Nepatné časové pásmo" -#: ../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 "" @@ -9138,65 +10086,65 @@ "Očekávaný formát: {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 "Neplatný posun" -#: ../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 "Nalezeno {0} shod s {1} v GPX trase {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 "Nahrána GPX trasa" -#: ../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 "Zvolené fotografie neobsahují informace o čase." -#: ../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 "Fotografie neobsahují informace o čase" -#: ../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." msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." -#: ../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 trasa neobsahuje časové údaje" -#: ../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 "Časová zóna: {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 "Minuty: {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 "Sekundy: {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} z {1} fotografií bylo dosazeno do GPX trasy." -#: ../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 "(Časový rozdíl {0} dnů)" -#: ../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 "Posun mezi trasou a fotografiemi: {0}m {1}s" -#: ../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 " @@ -9204,13 +10152,13 @@ msgstr "" -#: ../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 "Dosazení fotografií do trasy selhalo." -#: ../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 "Upravit časovou zónu a posun" -#: ../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 "Výchozí hodnoty" @@ -9231,5 +10179,5 @@ msgstr "Chyba v souboru {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9242,12 +10190,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 "Vybrat vše" - -#: ../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 "Chyba při nahrávání souboru" @@ -9276,8 +10223,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 "" "Město {0} nenalezeno, nebo není dostupné ve WMS.\n" @@ -9288,21 +10235,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 "Vyberte z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Katastr" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Automatické zdrojování" -#: ../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" @@ -9311,37 +10258,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 "Nahradit původní pozadí pozadím nastaveným v 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 "Obrácené stupně šedi (pro černá pozadí)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Nastavit průhledné pozadí." -#: ../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 "Zobrazovat hranice stažených dat." -#: ../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 "Zapnout automatické cachování." -#: ../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 "Max. velikost cache (v MB)" -#: ../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." @@ -9353,19 +10311,19 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS francouzského katastru" -#: ../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 "" "Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Zdroj" -#: ../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 " @@ -9374,5 +10332,5 @@ "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení 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). " @@ -9382,42 +10340,40 @@ "texty na tmavém pozadí." -#: ../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 "" "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné." -#: ../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 "Zobrazovat rámeček kolem dat stažených z WMS serveru." #. 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 "Násobič rychlého přehrávání" - -#: ../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 "" -#: ../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 "" -#: ../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 "Násobič rychlého přehrávání" - -#: ../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 "" @@ -9474,12 +10430,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Kontaktuji WMS server..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "obrázek nebyl nahrán" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9513,20 +10467,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" @@ -9534,9 +10488,14 @@ 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 +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" @@ -9544,31 +10503,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 "Zadejte šířku/délku místa kam skočit." - -#: ../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 "východ" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "sever" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Ponechat cizí souřadnice" +msgid "Set " +msgstr "Vybrat" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9632,6 +10599,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)" @@ -9656,6 +10623,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 "Prázdná vrstva" @@ -9671,7 +10638,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Katastr: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10198,6 +11165,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 "voda" @@ -10210,8 +11177,4 @@ msgid "land" msgstr "země" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "nic" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10506,9 +11469,9 @@ msgstr "Stahovací smyčka 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 "Zobrazuje chyby z 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 " @@ -10520,5 +11483,5 @@ "nový? (Velice doporučujeme)" -#: ../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 "Přepnout na nový openstreetbugs server?" @@ -11093,5 +12056,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 "Jméno ulice" @@ -11110,29 +12073,29 @@ msgstr "Zobrazit panel autorů" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Otevřít stránku uživatele" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Otevřít stránku uživatele v prohlížeči" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Vybrat data uživatele" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Nahradí výběr uživatelskými daty" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Vyberte nějaká data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Vyberte uživatele v panelu autorů" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Sorry, nefunguje s anonymními uživateli." @@ -11146,25 +12109,15 @@ msgstr "Spojí plochy, které se navzájem překrývají" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před nahráním " -"na server." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Přesto pokračovat" - -#: ../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 "Aktuálně lze sloučit maximálně pouze dvě plochy." -#: ../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}\" není uzavřená plocha a tedy nelze spojit." -#: ../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" @@ -11176,38 +12129,38 @@ "Opravdu chcete pokračovat?" -#: ../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 "Prosíme přerušte, pokud si nejste jisti" -#: ../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 "Vyberte alespoň jednu uzavřenou cestu k připojení." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Nenalezen žádný průnik. Nic se nemění." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Přidány body na všechny průsečíky" -#: ../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 "Smazat cesty, které nejsou součástí vnižního multipolygonu." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Opravit relace." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Spojena plocha překrývající sama sebe" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Spojeny překrývající se plochy" -#: ../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 " @@ -11217,81 +12170,81 @@ "tímto nedošlo ke vzniku chyb." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Opravit konflikty značek" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Prvek odstraněn z relací" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Spojit plochy: Vymazat krátké cesty" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Uzavřená cesta" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Odstranit tagy z vnitřních cest" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funkce spojení ploch" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Skok na pozici" -#: ../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 "Otevře dialog umožňující skočit na zadané místo" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Zadejte šířku/délku místa kam skočit." -#: ../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 "Můžete též vložit URL z www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Přiblížení (v metrech)" -#: ../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 "Skočit tam" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Skok na místo" -#: ../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 "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Nelze rozpoznat šířku/délku" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Zjednodušit cestu" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Smazat nepotřebné uzly z cesty." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Vyberte alespoň jednu cestu k zjednodušení." -#: ../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?" @@ -11302,25 +12255,25 @@ msgstr[2] "Výběr obsahuje {0} cest. Opravdu je chcete všechny zjednodušit?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Jste si jist?" -#: ../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 "Chyby kontroly" -#: ../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 "Žádné chyby při kontrole" -#: ../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 "Mřížka" -#: ../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 "" @@ -11409,53 +12362,53 @@ msgstr "Provede kontrolu dat" -#: ../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 "Data mají chyby. Přesto nahrát?" -#: ../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 "Otevřít okno s výsledkem kontroly." -#: ../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 "Přiblížit na problém" -#: ../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 "Opravit" -#: ../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 "Opravit vybrané chyby" -#: ../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 "Ignorovat" -#: ../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 "Ignorovat zvolené chyby pro příště." -#: ../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 "Celá skupina" -#: ../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 "Jednotlivé prvky" -#: ../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 "Nic" -#: ../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 "Ignorovat celou skupinu, nebo jednotlivé prvky?" -#: ../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 "Ignoruji elementy" -#: ../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" @@ -11479,23 +12432,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 "" "Tento test kontroluje na přítomnost silnic, železnic a vodních cest, které " "se kříží ve stejné vrstvě, ale nejsou spojeny společným uzlem." -#: ../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 "Vytvořit budovy" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Zkřížené cesty" -#: ../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 "Duplicitní uzly" -#: ../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 "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Uzly se stejným jménem" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Potvrzení" + +#: ../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 "Zduplikovat cestu" + +#: ../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 "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Vytvořit duplikát cesty" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11582,23 +12568,23 @@ msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep." -#: ../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 "Kontrola vlastností :" -#: ../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 "Tento plugin kontroluje chyby klíčů a jejich hodnot." -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -11609,7 +12595,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 "Neplatná kombinace klíče/hodnoty" @@ -11617,80 +12603,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 "Problém s vykreslováním" -#: ../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 "Klíč ''{0}'' je neplatný." -#: ../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 "Klíče s prázdnými hodnotami" -#: ../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 "Neplatné klíče vlastností" -#: ../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 "Neplatná mezera v klíči vlastnosti" -#: ../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 "Hodnota začíná nebo končí mezerou" -#: ../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 "Hodnota obsahuje HTML entitu" -#: ../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 "Klíč ''{0}'' není v předvolbách." -#: ../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 "Předvolby neobsahují vlastnost klíč" -#: ../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 "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení" -#: ../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 "Předvolby neobsahují vlastnost hodnota" -#: ../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 "OPRAVY" -#: ../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 "Kontrola klíčů vlastností." -#: ../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 "Kontroluje platnost klíčů vlastností proti seznamu slov." -#: ../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 "Použít komplexní kontrolu vlastností" -#: ../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 "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel." +#: ../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 "zdroj TagCheckeru" -#: ../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." @@ -11698,82 +12684,82 @@ msgstr "" -#: ../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 "Přidat nový zdroj do seznamu." -#: ../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 "Upravit zvolený zdroj." -#: ../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 "Zdroje dat" -#: ../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 "Kontrola hodnot vlastností." -#: ../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 "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám." -#: ../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 "Zkontrolovat tagy s FIXME." -#: ../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 "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti." +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Použít stadardní datový soubor." -#: ../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 "Použít standardní datový soubor (doporučeno)." +#: ../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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "Opravit vlastnosti" -#: ../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 "Nelze najít typ elementu" -#: ../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 "Nelze najít úroveň varování" -#: ../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 "Neplatný výraz ''{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}''" @@ -11920,7 +12906,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 "budova" @@ -11934,5 +12920,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 "oblast" @@ -12068,5 +13054,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Nastala výjimka" @@ -12133,14 +13119,14 @@ msgstr "Nápověda pluginu WMS Plugin" -#: ../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 "Zaměřený obrázek..." -#: ../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}" @@ -12151,26 +13137,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 "Vlastní WMS Link" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Podporované zdroje k překreslování:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Navštívit domovskou stránku" -#: ../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 "URL WMS nebo ID obrázku:" -#: ../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 " @@ -12178,37 +13164,55 @@ msgstr "" -#: ../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 "Neplatná URL WMS nebo id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Upravit 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 "Upravit pozici zvolené WMS vrstvy" -#: ../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 "" @@ -12223,15 +13227,43 @@ msgstr "Automatické stahování" -#: ../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 "Aktivovat" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {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 vrstva ({0}), stahování v přiblížení {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 "Neplatné datum" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12239,90 +13271,102 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Uložit WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Načíst vrstvu 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}" msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../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 "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Nastavení pluginu WMS Plugin" -#: ../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 "Upravit seznam WMS serverů zobrazený v menu WMS pluginu" -#: ../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 "Jméno v menu" -#: ../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 URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Jméno v menu (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS URL (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Zadejte jméno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Zkopírovat výchozí" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Zvolte minimálně jednu cestu." + +#: ../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 Soubory (*.tcx)" #. * @@ -12718,62 +13762,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 "Číslo" - -#. 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 "Vrstva" #. item "Streets/Motorway" combo "Layer" @@ -12788,5 +13777,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 "Jízdních pruhů" @@ -12801,5 +13790,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" @@ -12809,10 +13797,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 "Max. rychlost (km/h)" @@ -12856,9 +13844,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 "Jednosměrka" @@ -12906,13 +13894,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 "Most" @@ -12954,13 +13942,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 "Tunel" @@ -13000,12 +13988,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 "Zářez" @@ -13045,12 +14033,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 "Násep" @@ -13206,17 +14194,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 "Šířka (metrů)" @@ -13243,4 +14231,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" @@ -13259,11 +14248,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 "Povrch" @@ -13273,4 +14263,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" @@ -13285,9 +14276,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 "zpevněný" @@ -13295,10 +14287,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 "nezpevněný" + +#: 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 "Horská chata" + +#: 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 "beton" + +#: 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 "Půjčovna" + +#. 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 "Prales" + +#: 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 "parkovací lístky" #. item "Ways/Track Grade 2" combo "Surface" @@ -13306,12 +14361,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 "dlažební kostky" + +#: 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 "štěrk" + +#: 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 "dlažební kostky" + +#: 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 "nekompletní" + +#: 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 "tráva" + +#: 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 "tráva" + +#: 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 "písek" + +#. 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 "země" #. item "Streets/Residential" text "Width (meters)" @@ -13392,20 +14529,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Silniční omezení" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Upravit silniční omezení" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Poplatek" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Slepá ulice" @@ -13418,8 +14555,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 "Přístup" @@ -13454,32 +14591,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 "ano" @@ -13492,40 +14644,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 "soukromý" -#: 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 "vyhrazený(preferovaný)" @@ -13538,19 +14690,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 "dopravní obsluha" @@ -13573,65 +14725,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 "na povolení" -#: 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 "zemědelská vozidla" -#: 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 "ne" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Zásobování" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Nákladní vozidlo" @@ -13646,10 +14803,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 "Kůň" @@ -13665,17 +14822,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 "Motocykl" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13687,30 +14843,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 "Motorové vozidlo" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Vozidla MHD" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorová loď" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Loď" #. 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 "Min. rychlost (km/h)" @@ -13718,25 +14874,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 "Max. hmotnost (tun)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. výška (metrů)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. šířka (metrů)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. délka (metrů)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Kruhový objezd" @@ -13747,5 +14903,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 "Upravit křižovatku" @@ -13761,5 +14917,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" #. @@ -13767,9 +14923,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 "Typ" @@ -13789,10 +14945,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 "dálnice" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "Dálnice - nájezd" @@ -13814,10 +14970,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 "4. pruhová silnice" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "4. pruhová silnice - nájezd" @@ -13839,10 +14995,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 "silnice první třídy" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "Silnice 1. třídy - nájezd" @@ -13864,5 +15020,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" @@ -13877,9 +15033,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "silnice třetí třídy" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "silnice bez klasifikace" @@ -13893,9 +15049,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "obytná oblast" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "obytná zóna" @@ -13925,10 +15081,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 "obslužná cesta" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "Autobusová dráha" @@ -13958,6 +15114,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 "konstrukce" @@ -13968,10 +15124,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 "Edituj most" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Upravit tunel" @@ -13979,19 +15135,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Cesty" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Výstavba, plánovaná výstavba (Construction)" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Upravit silnici ve stavbě" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Križovatka" @@ -14007,5 +15163,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "kruhový objezd" @@ -14014,5 +15170,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Cesta pro koně" @@ -14020,5 +15176,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Upravit cestu pro koně" @@ -14026,5 +15182,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Cyklostezka" @@ -14034,11 +15190,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 "Upravit cyklostezku" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Pěší zóna" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Chodník, stezka" @@ -14047,11 +15209,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Upravit chodník nebo stezku" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Jednosměrné hroty" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Pěší zóna" @@ -14060,5 +15228,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Upravit pěší zónu" @@ -14066,5 +15234,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Schody" @@ -14074,5 +15242,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 "Upravit schody" @@ -14081,5 +15249,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Vozová cesta (track)" @@ -14088,39 +15256,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Upravit vozovou cestu" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "beton" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "štěrk" - -#. 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 "země" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "tráva" - -#: 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 "písek" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Vozová cesta stupně 1 (zpevněná)" @@ -14129,5 +15269,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)" @@ -14135,5 +15275,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Vozová cesta stupně 2" @@ -14142,5 +15282,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Upravit vozovou cestu stupně 2" @@ -14148,5 +15288,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Vozová cesta stupně 3" @@ -14155,5 +15295,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Upravit vozovou cestu stupně 3" @@ -14161,5 +15301,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Vozová cesta stupně 4" @@ -14168,5 +15308,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Upravit vozovou cestu stupně 4" @@ -14174,5 +15314,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Vozová cesta stupně 5 (nejhorší)" @@ -14181,5 +15321,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Upravit vozovou cestu stupně 5 (nejhorší)" @@ -14188,5 +15328,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Cesta vychozená v terénu pro cyklo/pěší (path)" @@ -14195,19 +15335,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Upravit cestu" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Lyže" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Sněžný skůtr" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Lyže" - #. 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 "turistická stezka" @@ -14217,5 +15360,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 "Editovat turistickou stezka" @@ -14223,5 +15366,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "horská turistická stezka" @@ -14231,5 +15374,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 "Editovat horskou stezka" @@ -14237,5 +15380,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Náročná horská stezka" @@ -14245,5 +15388,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 "Editovat náročnou horskou stezku" @@ -14251,5 +15394,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Vysokohorská stezka" @@ -14259,5 +15402,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 "Editovat vysokohorskou stezku" @@ -14265,5 +15408,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Náročná vysokohorská stezka" @@ -14273,5 +15416,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 "Editovat náročnou vysokohorskou stezku" @@ -14279,5 +15422,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Obtížná vysokohorská stezka" @@ -14287,5 +15430,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 "Upravit obtížnou vysokohorskou stezku" @@ -14293,10 +15436,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Silniční body" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Dálniční sjezd (exit)" @@ -14304,15 +15447,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Upravit křižovatku dálnic" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Číslo" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Služby motoristům (odpočívadla)" @@ -14320,5 +15463,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Upravit služby motoristům (odpočívadla)" @@ -14332,4 +15475,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" #. @@ -14349,18 +15494,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 "Operátor" @@ -14369,5 +15516,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Semafory" @@ -14377,5 +15524,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Typ přechodu pro chodce" @@ -14384,27 +15531,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 "volný" -#: 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 "světelná signalizace" -#: 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 "ostrov" -#: 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 "neoznačený" #. 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 "Přechod na koni" @@ -14412,6 +15559,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 "Přechod na kole" @@ -14420,11 +15567,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 "Dohled nad přechodem" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Typ přechodu (UK)" @@ -14432,30 +15579,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 "zebra (bez semaforů)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelikán (se semafory)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "papuchalk" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tygr" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stop" @@ -14463,5 +15610,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Přechod pro chodce" @@ -14470,14 +15617,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Upravit přechod" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Jméno typu (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Malý kruhový objezd" @@ -14488,14 +15635,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 "Směr" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "po směru hodinových ručiček" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Obratiště" @@ -14505,20 +15652,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 "Hranice města/obce" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Upravit značku hranice města/obce" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Druhé jméno" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Rychlostní radar" @@ -14526,5 +15673,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Nouzový telefon" @@ -14532,5 +15679,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Stoupání" @@ -14538,5 +15685,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Prudké stoupání" @@ -14545,10 +15692,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Brod" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Upravit brod" @@ -14556,5 +15703,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Horský průsmyk" @@ -14562,5 +15709,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Upravit horský průsmyk" @@ -14568,11 +15715,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 "Nadmořská výška" @@ -14580,5 +15727,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Bariéry" @@ -14586,5 +15733,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Sloupek" @@ -14592,5 +15739,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Upravit sloupek" @@ -14635,16 +15782,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 "Povolený provoz:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Zábrana proti kolům" @@ -14653,5 +15800,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Zátarasa" @@ -14659,5 +15806,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Mříž proti dobytku" @@ -14665,10 +15812,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Editovat mříž proti dobytku" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Zábrana průjezdná pouze autobusem" @@ -14676,15 +15823,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Jednosměrné hroty" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Editovat jednosměrné hroty" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Mýtná budka" @@ -14692,5 +15839,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Upravit mýtnou budku" @@ -14698,10 +15845,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Hraniční kontrola" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Upravit hraniční kontrolu" @@ -14711,5 +15858,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Živý plot" @@ -14718,5 +15865,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Plot" @@ -14725,5 +15872,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Zeď" @@ -14731,5 +15878,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Městské hradby" @@ -14738,5 +15885,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Opěrná zeď" @@ -14748,15 +15895,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Vstup" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Upravit vstup" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Brána" @@ -14764,50 +15911,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Editovat bránu" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Závora" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Upravit závoru" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Odstranitelný díl plotu" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Editovat odstranitelný díl plotu" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Brána otevíratelná nárazníkem vozidla" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Editovat bránu otevíratelnou nárazníkem vozidla" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Průchod v ohrazení s ostrou zatáčkou" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Editovat průchod v ohrazení s ostrou zatáčkou" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Schůdky přes ohrazení" @@ -14815,25 +15962,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Editovat schůdky přes ohrazení" #. 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 "Průchod se dvěma vraty" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Upravit průchod se dvěma vraty" @@ -14844,10 +15991,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 "Vodní plocha" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Pramen" @@ -14855,5 +16002,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Upravit pramen" @@ -14861,5 +16008,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Odvodňovací kanál, meliorace" @@ -14867,10 +16014,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Editovat odvodňovací kanál, meliorace" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Potok" @@ -14878,10 +16025,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Upravit potok" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Plavební kanál" @@ -14889,10 +16036,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Upravit plavební kanál" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Řeka" @@ -14902,5 +16049,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 "Upravit řeku" @@ -14908,15 +16055,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Upravit vodní plochu" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Země (souš)" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Upravit plochu země" @@ -14924,15 +16071,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Vodní nádrž" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Upravit vodní nádrž" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Umělá vodní plocha" @@ -14940,15 +16087,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Upravit umělou vodní plochu" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Zakrytá umělá vodní plocha" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Upravit zakrytou umělou vodní plochu" @@ -14956,5 +16103,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Břeh řeky" @@ -14963,10 +16110,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Upravit břeh řeky" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Mokřina" @@ -14977,14 +16124,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 "Upravit mokřinu" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "bažina" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "močál" @@ -14998,35 +16145,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "mokřina" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "rákosiny" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "slanisko" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "přílivová oblast" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangrove" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Bahno" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Upravit bahno" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Pláž" @@ -15034,20 +16181,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Upravit pláž" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Zátoka" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Upravit zátoku" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Útes" @@ -15055,10 +16202,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Upravit útes" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Linie pobřeží" @@ -15066,5 +16213,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Upravit linii pobřeží" @@ -15072,5 +16219,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Přívoz" @@ -15078,5 +16225,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Upravit přívoz" @@ -15085,5 +16232,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "doky" @@ -15091,10 +16238,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Upravit doky" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dok" @@ -15102,5 +16249,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Upravit dok" @@ -15108,5 +16255,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Hráz přehrady" @@ -15114,15 +16261,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Upravit přehradu" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Vodní objekty" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Plavební komora" @@ -15131,5 +16278,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Jez" @@ -15137,20 +16284,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Upravit jez" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Vodopád" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Upravit vodopád" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Rožšířené místo pro otáčení lodí" @@ -15159,15 +16306,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Přístav" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Upravit přístav" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Molo" @@ -15175,10 +16322,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Upravit molo" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Přístaviště přívozu" @@ -15186,10 +16333,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Upravit přístaviště přivozu" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Skluz v loděnici" @@ -15199,5 +16346,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 "Upravit skluz v loděnici" @@ -15205,10 +16352,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Železnice" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Železnice" @@ -15216,5 +16363,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Upravit železnici" @@ -15244,8 +16391,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 "Volitelné typy" @@ -15259,35 +16406,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 "seřazovací kolej" -#: 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 "paralelní pomocná dráha" -#: 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 "vlečka" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Úzkorozchodná železnice" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Upravit úzkorozchodnou železnici" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15295,45 +16442,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Upravit monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Historická trať" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Upravit historickou trať" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Krátká/lehká trať" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Upravit krátká/lehká trať" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Upravit metro" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tramvaj" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Upravit tramvaj" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Autobusová dráha" @@ -15341,5 +16488,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Upravit autobusovou dráhu" @@ -15348,14 +16495,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Nepoužívaná železnice" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Upravit nepoužívanou železnici" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Opuštěná železnice" @@ -15364,5 +16511,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "železniční přejezd" @@ -15371,5 +16518,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Železniční přechod pro chodce" @@ -15379,5 +16526,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Druh křížení" @@ -15385,5 +16532,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Točna" @@ -15392,10 +16539,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Lanovky" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Sedačková lanovka" @@ -15403,10 +16550,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Upravit sedačkovou lanovku" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Lyžařský vlek" @@ -15414,10 +16561,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Upravit lyžařský vlek" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Kyvadlová kabinková lanovka" @@ -15425,10 +16572,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Upravit kyvadlovou kabinkovou lanovku" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Oběžná kabinková lanovka" @@ -15436,5 +16583,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Upravit oběžnou kabinkovou lanovku" @@ -15442,5 +16589,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 "Stanice" @@ -15451,10 +16598,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 "Upravit stanici" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Čerpací stanice" @@ -15464,9 +16611,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 "Upravit čerpací stanici" #. 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 "Otevírací doba" + +#. 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" @@ -15486,106 +16862,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Upravit parkoviště" #. 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 "Číslo záchodu" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "vícepodlažní" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "povrchové" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "podzemní" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "park and ride" + +#. 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 "Poplatek" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapacita" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Místa pro vozíčkáře" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Místa pro vozíčkáře" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Místa pro vozíčkáře" + +#: 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 "Myčka" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Upravit myčku aut" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Obchod" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Upravit obchod s auty" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Opravna" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Upravit autoopravnu" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Půjčovna" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Upravit půjčovnu aut" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Sdílení" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "̈́Upravit sdílení aut" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Upravit parkoviště pro kola." + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapacita" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "povrchové" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "vícepodlažní" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "podzemní" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "park and ride" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Místa pro vozíčkáře" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Poplatek" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Myčka" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Upravit myčku aut" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Obchod" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Upravit obchod s auty" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Opravna" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Upravit autoopravnu" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Půjčovna" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Upravit půjčovnu aut" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Sdílení" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "̈́Upravit sdílení aut" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Upravit parkoviště pro kola." - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Upravit půjčovnu kol" @@ -15594,15 +17005,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Upravit prodejnu kol" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Hromadná doprava" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -15610,5 +17021,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železniční zastávka" @@ -15616,5 +17027,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Upravit železniční zastávku" @@ -15622,5 +17033,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tramvajová zastávka" @@ -15629,5 +17040,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Upravit tramvajovou zastávku" @@ -15635,5 +17046,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železniční nástupiště" @@ -15642,5 +17053,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Upravit železniční nástupiště" @@ -15652,5 +17063,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 "Číslo nástupiště" @@ -15658,10 +17069,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 "Označit jako plochu" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Vchod do metra" @@ -15670,10 +17081,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Upravit vchod do metra" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Invalidní vozík" @@ -15682,5 +17093,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Autobusové nádraží" @@ -15689,5 +17100,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Upravit autobusové nádraží" @@ -15695,5 +17106,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Zastávka autobusu" @@ -15703,5 +17114,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 "Upravit zastávku autobusu" @@ -15710,8 +17121,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 "Přístřešek" @@ -15719,10 +17128,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Nástupiště autobusu" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Upravit nástupiště autobusu" @@ -15730,5 +17139,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Stanoviště taxi" @@ -15736,5 +17145,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Upravit stanoviště taxi" @@ -15742,5 +17151,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Letiště" @@ -15748,15 +17157,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Upravit letiště" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15765,5 +17174,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Ubytování" @@ -15775,5 +17184,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -15782,15 +17191,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Upravit hotel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Počet hvězdiček" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -15798,20 +17207,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Upravit motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Penzion" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Upravit penzion" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Horská chata" @@ -15819,10 +17228,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Upravit horskou chatu" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Hostel" @@ -15830,30 +17239,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Upravit hostel" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Horská bouda" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Upravit vysokohorskou boudu" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Autokemping (karavany)" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Upravit autokemping (karavany)" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Tábořiště" @@ -15861,10 +17270,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Upravit tábořiště" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Jídlo a pití" @@ -15875,5 +17284,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurace" @@ -15881,5 +17290,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Upravit restauraci" @@ -15887,5 +17296,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 "Kuchyně" @@ -15893,61 +17302,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 "italská" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "čínská" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "řecká" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "německá" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indická" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "místní" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turecká" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asijská" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thajská" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexická" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japonská" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Rychlé občersvení" @@ -15955,9 +17364,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Upravit rychlé občerstvení" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kavárna" @@ -15965,10 +17374,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Upravit kavárnu" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Hospoda" @@ -15976,20 +17384,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Upravit hospodu" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Hospoda-zahrádka" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Upravit hospoda-zahrádka" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -15997,10 +17403,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Upravit bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Noční klub" @@ -16008,33 +17413,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Upravit noční klub" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turistika" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Atrakce" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Upravit atrakci" -#. 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 "Otevírací doba" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Muzeum" @@ -16042,10 +17438,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Upravit muzeum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16054,10 +17449,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Upravit zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Vyhlídka" @@ -16065,25 +17459,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Upravit vyhlídku" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Vyhlídková věž" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Zábavní park" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Upravit zábavní park" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Umělecké dílo" @@ -16091,5 +17484,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Upravit umělecké dílo" @@ -16097,86 +17490,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Turistické informační centrum" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Editovat turistické informační centrum" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Přehledová mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Typ mapy" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "mapa" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "plán města" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "turistická mapa" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "cyklistická mapa" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "ulice" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "čínská" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Stáhnout plochu" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Vložit" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Velkoměsto" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "místní" #. 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 "Bližší popis" #. 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 "Cyklistika" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "horská turistická stezka" + +#. 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 "Lyžování" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "paralelní pomocná dráha" + +#. 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 "Informační nástěnka" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Typ nástěnky" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "obecná nástěnka" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Hraniční kontrola" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "pro začátečníky (zelená)" + +#: build/trans_presets.java:1737 msgid "history" msgstr "informace o historii" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "informace o přírodě" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "informace o divokých zvířatech" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "využití oblasti (landuse)" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Rozcestník (pěší)" -#. 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 "Informace" + +#. 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 "Bližší popis" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Zvuk" + +#. +#: 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 "Telefonní číslo" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Jiný informační bod" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Upravit přístřešek" @@ -16184,25 +17702,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 "Ohniště" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Místo na piknik" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Upravit místo na piknik" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historická místa" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Zámek/Hrad" @@ -16211,20 +17729,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Upravit zámek/hrad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Zřícenina" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Upravit zříceninu" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Archeologické naleziště" @@ -16233,10 +17750,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Upravit archeologické naleziště" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Bojiště" @@ -16244,5 +17760,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Upravit bojiště" @@ -16250,15 +17766,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Upravit monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Památník" @@ -16266,45 +17782,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Upravit památník" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Kříž" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Upravit kříž" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Boží muka" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Upravit boží muka" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Volný čas" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Akvapark" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Upravit akvapark" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Hřiště" @@ -16312,15 +17828,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Upravit hřiště" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Rybaření" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Upravit rybaření" @@ -16328,15 +17844,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sportovní zařízení" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Upravit stadion" @@ -16350,6 +17866,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 "vyberte sport:" @@ -16741,30 +18257,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 "sport" @@ -16774,227 +18290,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 "kombinovaný" -#: 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 "lukostřelba" -#: 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 "atletika" -#: 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 "australský fotbal" -#: 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 "baseball" -#: 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 "basketbal" -#: 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 "Hry s koulemi (např. pétanque)" -#: 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 "bowls" -#: 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 "kanoistika" -#: 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 "Horolezení" -#: 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 "kriket" -#: 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 "ohražené místo pro tréning kriketu" -#: 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 "kroket" -#: 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 "cyklistika" -#: 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 "závody psů" -#: 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 "krasojízda" -#: 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 "fotbal" -#: 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 "golf" -#: 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 "gymnastika" -#: 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 "hokej" -#: 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 "dostihy" -#: 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 "motoristické sporty" -#: 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 "pelota (míčová hra)" -#: 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 "pálkové (raketové) sporty" -#: 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 "ragby" -#: 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 "střelba" -#: 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 "skateboard" -#: 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 "bruslení" -#: 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 "lyžování" -#: 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 "fotbal" -#: 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 "plavání" -#: 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 "stolní tenis" -#: 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 "tenis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sportovní centrum" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Upravit sportovní centrum" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Hřiště" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Upravit hřiště" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Závodní trať" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Upravit závodní trať" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfové hřiště" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Upravit golfové hřiště" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Upravit minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Kombinováné" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Upravit kombinované" @@ -17033,248 +18547,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 "hřiště" -#: 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 "sportovní centrum" -#: 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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Upravit bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletika" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Upravit atletiku" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Lukostřelba" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Upravit lukostřelbu" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Horolezení" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Upravit horolezení" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kanoistika" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Upravit kanoistiku" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Cyklistika" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Upravit cyklistiku" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Závody psů" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Upravit závody psů" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Krasojízda" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Upravit krasojízdu" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Dostihy" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Upravit dostihy" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastika" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Upravit gymnastiku" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorové sporty" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Upravit motorové sporty" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Bruslení" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Upravit bruslení" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Upravit Skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Plavání" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Upravit plavání" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Lyžování" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Upravit lyžování" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Typ sjezdovky" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "Sjezdovka" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "Běžecká trať" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snow park" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Obtížnost" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "pro začátečníky (zelená)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "jednoduchá (modrá)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "pro středně pokročilé (červená)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "pro zkušené (černá)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "pro experty (oranžová)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "volný terén - freeride (žlutá)" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Střelba" @@ -17282,178 +18788,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Upravit střelbu" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Sport (míčové hry)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fotbal" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Upravit fotbal" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Fotbal" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Upravit fotbal" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australský fotbal" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Upravit australský fotbal" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Upravit baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketbal" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Upravit basketbal" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Upravit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golfové hřiště" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Hry s koulemi (např. pétanque)" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Upravit hry s koulemi (např. pétanque)" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowls" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Upravit Bowls" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Kriket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Upravit kriket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Ohražené místo pro tréning kriketu" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Upravit ohražené místo pro tréning kriketu" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Kroket" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Upravit kroket" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hokej" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Upravit hokej" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota (míčová hra)" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Upravit pelotu (míčová hra)" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Pálkové (raketové) sporty" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Upravit pálkové (raketové) sporty" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Ragby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Upravit ragby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Stolní tenis (ping-pong)" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Upravit stolní tenis (ping-pong)" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tenis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Upravit tenis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Budovy" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Budova" @@ -17461,5 +18967,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Veřejná budova" @@ -17467,10 +18973,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Upravit veřejnou budovu" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Radnice" @@ -17478,10 +18984,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Upravit radnici" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambasáda" @@ -17489,10 +18995,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Upravit ambasádu" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Soud" @@ -17501,10 +19007,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Upravit soud" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Vězení" @@ -17513,10 +19019,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Upravit vězení" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Policie" @@ -17526,10 +19032,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 "Upravit policii" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Hasičská stanice" @@ -17538,10 +19044,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Upravit hasičskou stanici" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Pošta" @@ -17549,5 +19055,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Upravit poštu" @@ -17555,15 +19061,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Mateřská škola" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Upravit mateřskou školu" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Škola" @@ -17571,10 +19077,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Upravit školu" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Vysoká škola" @@ -17582,10 +19088,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Upravit vysokou školu" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Střední škola" @@ -17593,5 +19099,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Upravit střední školu" @@ -17599,5 +19105,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kino" @@ -17606,10 +19112,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Upravit kino" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Knihovna" @@ -17618,10 +19124,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Upravit knihovnu" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Komunitní umělecké centrum" @@ -17629,10 +19134,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Upravit komunitní umělecké centrum" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Divadlo" @@ -17641,10 +19146,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Upravit divadlo" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Chrám(kostel, synagoga, mešita)" @@ -17654,5 +19159,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 "Upravit chrám" @@ -17661,6 +19166,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 "Náboženství" @@ -17669,66 +19174,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 "bahá'í" -#: 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 "budhistické" -#: 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 "křesťanské" -#: 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 "hindské" -#: 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 "džinistické" -#: 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 "židovské" -#: 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 "muslimské" -#: 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 "spiritualistické" -#: 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 "taoistické" -#: 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 "Unitářské" -#: 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 "zoroastristické" -#: 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 "Vyznání" @@ -17737,81 +19242,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 "anglikánské" -#: 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 "baptistické" -#: 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 "katolické" -#: 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 "evangelické" -#: 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 "svědkové Jehovovi" -#: 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 "luteránské" -#: 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 "metodistické" -#: 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 "mormonské" -#: 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 "pravoslavné" -#: 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 "pentekostalistické" -#: 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 "presbyteriánské" -#: 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 "protestantské" -#: 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 "kvakerské" -#: 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 "ší'itské" -#: 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 "sunnitské" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresy" @@ -17820,5 +19325,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Upravit informace o adrese" @@ -17826,5 +19331,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Číslo domu" @@ -17832,20 +19337,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Jméno domu" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Jméno města" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Poštovní směrovací číslo" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Kód země" @@ -17853,5 +19358,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolace adres" @@ -17860,5 +19365,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Upravit interpolaci adres" @@ -17866,71 +19371,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Schéma číslování" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "liché" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "sudé" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "všechny" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "abecední" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Umělé konstrukce" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Továrna" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Upravit továrnu" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Věž" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Upravit věž" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vodojem" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Upravit vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Plynojem" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Upravit plynojem" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Maják" @@ -17938,10 +19439,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Upravit maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Větrný mlýn" @@ -17949,10 +19450,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Upravit větrný mlýn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Potrubí" @@ -17960,10 +19461,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Upravit potrubí" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Čistička odpadních vod" @@ -17973,10 +19474,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 "Upravit čističku odpadních vod" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Jeřáb" @@ -17984,10 +19485,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Upravit jeřáb" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Vodní bój" @@ -17995,10 +19496,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Editovat vodní bój" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Triangulační bod" @@ -18006,10 +19507,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Upravit triangulační bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Sledovací kamera" @@ -18017,5 +19518,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Upravit sledovací kameru" @@ -18023,5 +19524,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Elektrárna" @@ -18031,39 +19532,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 "Upravit elektrárnu" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "větrná" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vodní" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fosilní paliva" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "jaderná" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "uhelná" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "sluneční" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "plynová" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Rozvodna" @@ -18072,10 +19573,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Upravit rozvodnu" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Trafostanice" @@ -18084,5 +19585,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Upravit trafostanici" @@ -18090,10 +19591,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 "Číslo vedení" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Stožár elektrického vedení" @@ -18104,5 +19605,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 "Upravit stožár elektrického vedení" @@ -18110,5 +19611,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Dráty elektrického vedení" @@ -18117,46 +19618,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Upravit dráty elektrického vedení" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Napětí" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Počet drátů tvořících vodič" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Občanská vybavenost" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Záchody" -#. 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 "Číslo záchodu" - #. 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 "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Poštovní schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -18165,5 +19660,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Upravit telefon" @@ -18171,5 +19666,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 "Mince" @@ -18177,5 +19672,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 "Bankovky" @@ -18183,5 +19678,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 "Elektronické peněženky nebo kreditní karty." @@ -18189,5 +19684,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 "Debetní karty" @@ -18195,15 +19690,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 "Kreditní karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonní karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recyklační stanoviště" @@ -18212,5 +19707,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Upravit recyklační stanoviště" @@ -18218,80 +19713,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Oblečení" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Kovový šrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Lavička" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Posed" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Upravit posed" -#. 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 "Výška" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "nízká" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "střední" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "plná" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Úkryt" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Uzamknutelný" -#. 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 "Výška" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "nízká" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "střední" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "plná" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontána" @@ -18300,10 +19791,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Upravit fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Pitná voda" @@ -18312,10 +19803,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Upravit pitnou vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Babybox" @@ -18323,25 +19814,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Upravit babybox" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Upravit supermarket" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Horská chata" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Upravit horskou chatu" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Samoobsluha, smíšenka, večerka" @@ -18349,10 +19850,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Upravit večerku" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosek" @@ -18360,10 +19860,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Upravit kiosek" -#. 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 "Upravit zastávku autobusu" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Upravit strom" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Prodejní automat" @@ -18371,5 +19890,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Upravit prodejní automat" @@ -18377,88 +19896,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Prodávané produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "lístky na městskou hromadnou dopravu" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "plány městské hromadné dopravy" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parkovací lístky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "jídlo" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "pití" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "krmivo pro zvířata" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telefonní karty" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "poukazy" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "kondomy" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Zůstatkové nebo věrnostní karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Řeznictví" @@ -18466,10 +19985,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Upravit řeznictví" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Pekařství" @@ -18477,10 +19995,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Upravit pekařství" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Květinářství" @@ -18488,20 +20005,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Upravit květinářství" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Obchod se zdravou výživou" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Upravit obchod se zdravou výživou" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Alkohol" @@ -18509,60 +20024,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Upravit obchod s alkoholem" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Nápoje" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Upravit obchod s nápoji" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Počítače" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Upravit obchod s počítači" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronika" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Upravit obchod s elektronikou" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Upravit obchod s hifi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Nábytek" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Upravit obchod s nábytkem" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Zahradnické centrum" @@ -18570,10 +20079,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Upravit zahradnické centrum" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Železářství" @@ -18581,10 +20089,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Upravit železářství" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Zboží pro kutily" @@ -18592,60 +20099,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Upravit obchod se zbožím pro kutily" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Papírnictví" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Upravit papírnictví" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Kadeřnictví" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Upravit Kadeřnictví" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Obuv" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuví" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Hračky" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Upravit obchod s hračkami" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Videopůjčovna/prodejna" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Upravit videopůjčovnu/prodejnu" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Čistírna" @@ -18653,10 +20154,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Upravit čistírnu" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Prádelna" @@ -18664,10 +20164,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Upravit prádelnu" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Vybavení do přírody" @@ -18675,35 +20174,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Obchod s vybavením do přírody" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sportovní potřeby" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Upravit obchod se sportovními pořebami" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Oční optik" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Upravit oční optiku" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Finance" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banka" @@ -18711,16 +20207,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Upravit banku" -#. 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 "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Směnárna" @@ -18728,5 +20222,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Upravit směnárnu" @@ -18734,15 +20228,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Upravit bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Zdraví" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Středisko" @@ -18750,20 +20244,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Upravit středisko" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Zubař" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Upravit zubařskou ordinaci" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Lékárna" @@ -18771,5 +20263,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Upravit lékárnu" @@ -18777,10 +20269,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Vydává léky na předpis" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Nemocnice" @@ -18788,10 +20279,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Upravit nemocnici" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Místo pro kontaktování záchranářů" @@ -18800,5 +20291,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Upravit místo pro kontaktování záchranářů" @@ -18807,20 +20298,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Číslo místa" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Jméno místa" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Telefonní číslo" #. 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 "(Použijte mezinárodní zápis, např. +420123456789)" @@ -18828,5 +20319,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 "Veterinář" @@ -18835,55 +20326,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Upravit veterinární ordinaci" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Upravit kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Stát" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Upravit stát" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Země" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Upravit zemi" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Kraj" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Upravit kraj" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Okres" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Upravit okres" @@ -18891,15 +20382,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Velkoměsto" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Upravit velkoměsto" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Město" @@ -18907,10 +20398,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Upravit město" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Městský obvod, nebo městská část" @@ -18918,25 +20409,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Upravit městský obvod, nebo městská část" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Obec" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Upravit obci" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Samota" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Upravit samotu" @@ -18944,5 +20435,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Místní název" @@ -18950,10 +20441,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Editovat místní název" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Ostrov" @@ -18961,11 +20452,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Upravit ostrov" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "vlevo" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Upravit horskou chatu" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Vstup do jeskyně" @@ -18973,10 +20477,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Upravit vstup do jeskyně" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Vrchol" @@ -18984,10 +20488,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Upravit vrchol" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Ledovec" @@ -18995,10 +20499,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Upravit ledovec" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Sopka" @@ -19006,70 +20510,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Upravit sopku" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Národní" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Upravit národní hranici" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrativní" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Upravit administrativní hranici" #. 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 "Volební obvod" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Upravit volební obvod" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Národní park" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Upravit hranice národního parku" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Využití krajiny" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Strom" @@ -19078,15 +20582,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Upravit strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanické jméno" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Prales" @@ -19095,5 +20599,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Editovat Prales" @@ -19101,17 +20605,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 "jehličnatý" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "smíšený" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Les" @@ -19120,14 +20624,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Upravit lesní plochu" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Přírodní rezervace" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Upravit přírodní rezervaci" @@ -19135,25 +20639,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Suťoviště" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Upravit suťoviště" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Podrost" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Upravit podrost" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Travnatá pahorkatina" @@ -19161,10 +20665,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Upravit travnatou pahorkatinu" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Vřesoviště" @@ -19172,5 +20676,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Upravit vřesoviště" @@ -19178,5 +20682,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Farma" @@ -19185,45 +20689,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Upravit farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Zemědělská půda" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Upravit zemědělskou půdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Louka" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Upravit louku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vinice" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Upravit vinici" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Zahrádkářská kolonie" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Upravit zahrádkářskou kolonii" @@ -19231,25 +20735,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Zahrada" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Upravit zahradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Tráva" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Upravit travnatou plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Zelená plocha" @@ -19257,10 +20761,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Upravit zelenou plochu" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "veřejná zeleň (mimo parky)" @@ -19268,20 +20772,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Upravit veřejnou zeleň" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Upravit park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Rekreační plocha" @@ -19289,5 +20793,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Upravit rekreační plochu" @@ -19295,15 +20799,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Obytná plocha" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Upravit obytnou plochu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Malý hřbitov" @@ -19311,9 +20815,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Upravit malý hřbitov" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Hřbitov" @@ -19321,39 +20825,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Upravit hřbitov" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Obchody" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Upravit plochu s obchody" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Kanceláře" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Upravit kancelářskou plochu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Průmysl" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Upravit průmyslovou plochu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Železniční plocha" @@ -19361,15 +20865,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Upravit železniční plochu" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Vojenský prostor" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Upravit vojenský prostor" @@ -19377,55 +20881,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Probíhající výstavba" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Upravit výstavbu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Stará zátěž, městské ruiny (Brownfield)" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Upravit starou zátěž (Brownfield)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Zastavitelné území (Greenfield)" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Upravit zastavitelné území (Greenfield)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "skládka odpadu" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Upravit skládku odpadu" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Lom" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Upravit lom" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19435,5 +20939,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 "Upravit multipolygon" @@ -19442,10 +20946,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "vnější část" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "vnitřní část" @@ -19453,5 +20957,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Zákaz odbočení" @@ -19460,5 +20964,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Upravit zákaz odbočení" @@ -19466,34 +20970,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Omezení" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "zákaz odbočení vlevo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "zákaz odbočení vpravo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "zákaz jízdy rovně" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "zákaz otáčení" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "pouze odbočení vpravo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "pouze odbočení vlevo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "pouze jízda rovně" @@ -19502,15 +21006,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "přes uzel nebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "na cestu" @@ -19518,5 +21022,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Trasa" @@ -19525,5 +21029,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Upravit trasu" @@ -19531,5 +21035,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Typ trasy" @@ -19601,5 +21105,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 @@ -19608,17 +21112,17 @@ msgstr "bicykl" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "silnice" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "trajekt" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "lyžařská" @@ -19671,5 +21175,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 @@ -19678,13 +21182,13 @@ msgstr "pěší" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "turistická" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tramvajová" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "objízdná" @@ -19698,10 +21202,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Popis symbolu" @@ -19709,31 +21213,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Síť" #. 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 "navrhovaná" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternativní" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "dočasná" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "spojení" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Barva (hex)" @@ -19742,30 +21246,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "segment trasy" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "dopředný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "zpětný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "zastávka" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "dopředná zastávka" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "zpětná zastávka" @@ -20203,11 +21707,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 "zastaralý" @@ -20533,41 +22037,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 "ulice" #. color street @@ -22268,5 +23735,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 "menší vodní plochy" @@ -22865,55 +24332,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22927,5 +24345,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 "turistika" @@ -22997,8 +24415,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 "historické" @@ -23069,8 +24487,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 "zeleň" @@ -23084,5 +24502,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "lom" @@ -23096,5 +24514,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "skládka" @@ -23116,5 +24534,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "nádrže" @@ -23128,5 +24546,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "les" @@ -23140,5 +24558,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "zemědělství" @@ -23161,5 +24579,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "obchody" @@ -23173,5 +24591,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "průmysl" @@ -23185,5 +24603,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "stará zátěž, městské ruiny (Brownfield)" @@ -23197,5 +24615,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "Zastavitelné území (Greenfield)" @@ -23209,5 +24627,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "železniční plochy" @@ -23264,7 +24682,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 "vojenský" @@ -23278,5 +24696,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "hřbitov" @@ -23289,5 +24707,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "vrchol" @@ -23302,5 +24720,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "ledovec" @@ -23314,5 +24732,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "sopka" @@ -23367,8 +24785,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 "přírodní" @@ -23382,5 +24800,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "křoví" @@ -23394,20 +24812,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "vřesoviště" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "Prales" - #. color water #. 1 @@ -23418,5 +24824,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "bahno" @@ -23430,5 +24836,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "pláž" @@ -23506,8 +24912,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 "cesta" @@ -23555,7 +24961,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 "hranice" @@ -23697,10 +25103,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 "místo" @@ -23748,6 +25163,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 "adresa" @@ -24044,4 +25459,105 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako " +#~ "chybu." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Není otevřený žádný dokument, není co uložit." + +#~ msgid "Change {0} {1}" +#~ msgstr "Změnit {0} {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Smazat {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Odstranit člena relace {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Nelze otevřít adresář s nastavením: {0}" + +#~ msgid "nodes" +#~ msgstr "body" + +#~ msgid "ways" +#~ msgstr "cesty" + +#~ msgid "relations" +#~ msgstr "vazby" + +#~ msgid "changesets" +#~ msgstr "sady změn" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?" + +#~ msgid "Delete Layer" +#~ msgstr "Smazat vrstvu" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Opravdu chcete smazat vrstvu ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Smazat vše" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Mazání vrstvy {0} z {1}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autoři: {0}" + +#~ msgid "Public" +#~ msgstr "Veřejné" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " +#~ "nahráním na server." + +#~ msgid "Continue anyway" +#~ msgstr "Přesto pokračovat" + +#~ msgid "Edit Information Office" +#~ msgstr "Editovat turistické informační centrum" + +#~ msgid "Map Type" +#~ msgstr "Typ mapy" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "citymap" +#~ msgstr "plán města" + +#~ msgid "hikingmap" +#~ msgstr "turistická mapa" + +#~ msgid "bicyclemap" +#~ msgstr "cyklistická mapa" + +#~ msgid "Board Type" +#~ msgstr "Typ nástěnky" + +#~ msgid "board" +#~ msgstr "obecná nástěnka" + #~ msgid "Email" #~ msgstr "E-mail" @@ -24098,7 +25614,4 @@ #~ msgstr "Vrátit zpět" -#~ msgid "Not implemented yet." -#~ msgstr "Zatím neimplementováno." - #~ msgid "Add Selected" #~ msgstr "Přidat vybrané" @@ -24142,7 +25655,4 @@ #~ msgid "Click Reload to refresh list" #~ msgstr "Klikněte na obnovit pro aktualizaci seznamu" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Vyřešit {0} konfliktů v {1} objektech" #~ msgid "" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 17484) +++ /applications/editors/josm/i18n/po/da.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-16 22:09+0000\n" -"Last-Translator: Peter Brodersen \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:18+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Skaber hovedgrænsefladen" #. 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 "Hjælp" -#: ../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 "Projiceringen {0} kunne ikke aktiveres. Benytter Mercator." -#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Fejl" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren" - -#: ../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] "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?" +msgstr[1] "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Ugemte ændringer" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?" - -#: ../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 "Gem og afslut" -#: ../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 "Smid væk og afslut" -#: ../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 "Fortryd" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer defekt URL: \"{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 "Advarsel" -#: ../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 "Ignorerer defekt fil-URL: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Udvidelser" @@ -344,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Vælg venligst et allerede uploadet punkt, vej eller relation." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -359,5 +376,5 @@ msgstr "" -#: ../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 "" @@ -367,11 +384,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Sammenflet" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -382,5 +399,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "" @@ -397,11 +414,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 @@ -430,5 +447,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 "Breddegrad" @@ -437,30 +454,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 "Længdegrad" +#: ../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 "Opstil punkter i cirkel" -#: ../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 "Flyt de valgte punkter ind i en cirkel" -#: ../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 @@ -474,6 +491,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 @@ -481,58 +498,57 @@ msgstr "Værktøj: {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 "Vælg mindst fire punkter." #. 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 "Oplysninger" #. 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 "Stil punkter op på linje" -#: ../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 "Flyt de valgte punkter på linje" -#: ../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 "Vælg venligst mindst tre punkter." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -543,10 +559,10 @@ "{0}, maksimum er {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 "Brud på API-egenskaber" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -555,5 +571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -562,46 +578,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Brud på forudgående krav" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "valgt" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "hent" +#: ../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 "Zoom til {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 "Zoom synsfeltet til {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 @@ -611,22 +627,22 @@ msgstr "Vis: {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 "Intet valgt at zoome ind på." -#: ../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 "Ingen konflikter at zoome ind på." +#: ../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 "Sammensæt vej" -#: ../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 "Sammensæt adskillige veje til én" -#: ../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 "Vælg mindst to veje at sammensætte." @@ -637,4 +653,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Sammensæt alligevel" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -644,19 +664,7 @@ "sammensætte dem?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Sammensæt alligevel" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Skift retninger?" - -#: ../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 "" -"Vejene kan ikke sammensættes med deres nuværende retninger. Vil du vende " -"nogle af dem om?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -664,27 +672,34 @@ msgstr "Vend om og sammensæt" -#: ../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 "" +"Vejene kan ikke sammensættes med deres nuværende retninger. Vil du vende " +"nogle af dem om?" + +#: ../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 "Indtast værdier for alle konflikter." -#: ../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 "Løs konflikter" -#: ../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 "Sammensæt {0} veje" -#: ../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 "Alle vejene var tomme" -#: ../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 " @@ -694,32 +709,32 @@ "af punkter)" +#: ../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 "Kopier" -#: ../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 "Kopier valgte objekter til udklipsholderen." -#: ../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 "Vælg venligst noget at kopiere." +#: ../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 "Opret cirkel" -#: ../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 "Opret cirkel ud fra tre valgte punkter." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -729,20 +744,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 "Fjern" @@ -752,85 +767,86 @@ msgstr "Slet valgte objekter." -#: ../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 "Overskriv" -#: ../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 "Filen findes allerede. Overskriv?" #. 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 "Fordel punkter" -#: ../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 "Fordel de valgte punkter med samme afstand langs en linje." +#: ../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 "Hent fra 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 "Hent kort-data fra OSM serveren." -#: ../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 "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Hent" -#: ../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 "Vælg mindst én opgave til download" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Hent tilknytninger fra 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 "Henter tilknytninger" -#: ../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 "Der var {0} konflikter under import." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -839,6 +855,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 "Duplikér" @@ -862,85 +878,91 @@ msgstr "Afslut programmet." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Alle billeder" + +#: ../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 "Eksporter til 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 "Eksporter dataet til GPS-fil." -#: ../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 "Intet at eksportere. Hent først noget data." -#: ../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 "parameter \"{0}\" må ikke være null" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM Online-hjælp" -#: ../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 "Åbn i browser" -#: ../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 "Rediger" -#: ../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 "Genindlæs" -#: ../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 "Kan kun redigere hjælpesider fra JOSM Online-hjælp" -#: ../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 "Fejl ved indlæsning af siden {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." msgstr "Hjælpesiden mangler. Opret den på engelsk" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -994,22 +1016,26 @@ msgstr "Flet det nuværende lag sammen med et andet lag" +#: ../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 "Foren punkter" -#: ../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 "Foren punkter til den ældste." -#: ../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 "Vælg mindst to punkter, der skal forenes." -#: ../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 "Foren punkter med forskellige medlemsskaber?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Sammenflet alligevel" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1019,9 +1045,5 @@ "sammenflette dem?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Sammenflet alligevel" - -#: ../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 "" @@ -1029,69 +1051,69 @@ "er i brug." -#: ../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 "Foren {0} punkter" +#: ../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 "Sammenflet det valgte" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Sammenflet de aktuelt valgte primitiver til et nyt lag" +#: ../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 "Afspejl" -#: ../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 "Afspejl de valgte punkter og veje" -#: ../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 "Vælg mindst ét punkt eller vej." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "op" -#: ../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 "Flyt objekterne {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "venstre" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "højre" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Flyt {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 "Flytter objekterne {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 "Kan ikke flytte objekter ud af verden." @@ -1099,5 +1121,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 "Ny" @@ -1107,17 +1129,22 @@ msgstr "Opret et nyt kort." -#: ../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 "Åbn..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Åbn en fil" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Åbn en fil" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Ukendt rolle \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1155,21 +1182,17 @@ msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Kun to punkter er tilladt." -#: ../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 "Det valgte må kun bestå af veje." -#: ../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 "Vælg venligst en eller flere lukkede veje på mindst fire punkter." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." - -#: ../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 " @@ -1178,9 +1201,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 "Kun et punkt er valgt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Gør vinkler rette" @@ -1196,13 +1219,26 @@ msgstr "Indsæt indhold af udklipsholderen." -#: ../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 "Indsæt tags" -#: ../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 "Tilføj tags i udklipsholderen til alle valgte elementer." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Henter {0}" +msgstr[1] "Henter {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Gendan {0} primitiver" +msgstr[1] "Gendan {0} primitiver" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1228,37 +1264,32 @@ msgstr "Omgør seneste fortrydelse" -#: ../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 "Omdøb lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Omdøb også filen" -#: ../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 "" +#: ../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 "Vend veje om" -#: ../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 "Vend retningen for alle valgte veje." -#: ../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 "Vælg mindst én vej." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Vend veje om" @@ -1266,10 +1297,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 "Gem" #: ../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 "Gem nuværende data." @@ -1280,37 +1312,25 @@ msgstr "Filen {0} eksisterer allerede. Overskriv?" -#: ../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 "" -"Intern fejl: kan ikke tjekke omstændighederne for manglende lag. Rapportér " -"venligst dette som en fejl." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Intet dokument er åbent, så der er intet at gemme." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Tomt dokument" -#: ../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 "Dette dokument indeholder intet data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Gem alligevel" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikter" -#: ../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 " @@ -1320,28 +1340,28 @@ "håndteret som om, du afviste dem alle. Fortsæt?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Afvis konflikter og gem" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Gem OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Gem GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Gem lag" +#: ../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 "Gem som..." -#: ../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 "Gem det nuværende data i en ny fil." @@ -1374,33 +1394,33 @@ msgstr "Hjælp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Statusrapport" -#: ../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 "Kopier til udklipsholder og luk" -#: ../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 "Luk" +#: ../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 "Opdel vej" -#: ../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 "Opdel en vej ved det valgte punkt" -#: ../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 "Det nuværende valgte kan ikke bruges til opdeling" -#: ../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." @@ -1408,5 +1428,5 @@ msgstr[1] "De valgte punkter er ikke i midten af nogen vej." -#: ../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 " @@ -1420,9 +1440,9 @@ "Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen." -#: ../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 "De valgte punkter deler ikke samme vej." -#: ../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." @@ -1430,10 +1450,10 @@ msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter." -#: ../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 "Du skal vælge mindst to punkter for at opdele en kredsformig vej" -#: ../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 " @@ -1443,5 +1463,5 @@ "vejen.)" -#: ../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 " @@ -1449,5 +1469,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 " @@ -1455,8 +1475,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 "Opdel vejen {0} i {1} stykker" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Lukker rettesæt..." + +#: ../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 "Lukker rettesæt..." + +#: ../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 "Åbner rettesæt..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Lukker rettesæt..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1474,46 +1519,46 @@ msgstr "Skifter den globale indstilling \"{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 "Adskil veje" -#: ../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 "Dublet-punkter, som bruges af flere veje." -#: ../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 "Dette punkt er ikke forbundet til noget andet." -#: ../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 "Ingen af disse punkter er fastklistret til noget andet." -#: ../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 "Ingen af denne vejs punkter er forbundet til noget andet." -#: ../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 "Vælg enten:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Et markeret punkt, eller" -#: ../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 "* Et punkt, som bruges af mere end én vej, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* Et punkt, som bruges af mere end én vej en af disse veje, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1522,5 +1567,5 @@ "eller" -#: ../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." @@ -1529,5 +1574,5 @@ "vej." -#: ../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" @@ -1537,9 +1582,9 @@ msgstr "" -#: ../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" @@ -1547,5 +1592,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" @@ -1589,61 +1634,71 @@ msgstr "Opdaterer det nuværende datalag fra serveren (genhenter data)" -#: ../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 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Opdater det valgte" -#: ../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 "Opdaterer de valgte primitiver fra serveren" -#: ../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 "Der er ingen valgte primitiver at opdatere." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Intet er valgt" -#: ../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 "Send til 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 "Send alle ændringer til OSM-serveren." -#: ../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 "Der er uløste konflikter. Du skal løse disse først." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Intet at sende. Skab først noget data." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Der er uløste konflikter. Du skal løse disse først." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Ingen ændringer at sende." -#: ../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 "Synkronisér kun {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 "Synkronisér hele datasættet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1657,17 +1712,17 @@ msgstr "" -#: ../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 "Der er opdaget en konflikt" #. 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 "uventet svar. Modtog {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1678,32 +1733,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Upload til OSM-API'et fejlede" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Opdaterer primitiv" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Send disse ændringer?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Send ændringer" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Tilføj et nyt punkt til en eksisterende vej" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1711,31 +1804,80 @@ 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 "Angiv en kort kommentar for de ændringer, du uploader:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Indstillinger for kort" + +#: ../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 "rettesæt" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Tilføjede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Ændrede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Slettede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Angiv en kort kommentar for de ændringer, du uploader:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Send disse ændringer?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Send ændringer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Sender" +#: ../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] "Tilføjede objekter:" +msgstr[1] "Tilføjede objekter:" + +#: ../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] "Ændrede objekter:" +msgstr[1] "Ændrede objekter:" + +#: ../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] "Slettede objekter:" +msgstr[1] "Slettede objekter:" + +#: ../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 "Seneste ændring ved {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1759,20 +1901,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 "Lyd: {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 "Hurtigere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Hurtigere fremad" @@ -1814,10 +1956,10 @@ msgstr "Afspil forrige markør." -#: ../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 "Langsommere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Langsommere fremad" @@ -1845,31 +1987,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 "Intet data importeret." -#: ../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-data" -#: ../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 "Henter {0} af {1} ({2} tilbage)" -#: ../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 "Fejl ved download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1881,20 +2019,20 @@ msgstr "" -#: ../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 "Slettede eller flyttede primitiver" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Slette-tilstand" -#: ../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 "Slet punkter eller veje." -#: ../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 @@ -1903,5 +2041,5 @@ msgstr "Tilstand: {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 " @@ -1911,55 +2049,69 @@ "når en vej slettes. Ctrl: Slet refererende objekter." -#: ../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 "parameteren \"{0}\" må ikke være en null-værdi" +#: ../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 "Tegn" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Tegn punkter" -#: ../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 "Tilstand: Tegn fokus" -#: ../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 @@ -1967,38 +2119,38 @@ msgstr "valgt" -#: ../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 "Kan ikke tilføje et punkt uden for verdenen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Tilføj punkt" -#: ../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 "Tilføj punkt inde i vej" -#: ../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 "Forbind eksisterende vej til punkt" -#: ../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 "Tilføj et nyt punkt til en eksisterende vej" -#: ../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 "Tilføj punkt ind i vej og forbind" -#: ../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 "Opret nyt punkt." -#: ../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 "Vælg punkt under markøren." -#: ../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." @@ -2007,14 +2159,14 @@ msgstr[1] "Indsæt nyt punkt i {0} veje." -#: ../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 "Start ny vej fra seneste punkt." -#: ../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 "Fortsæt vej fra seneste punkt." -#: ../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 "Afslut tegning." @@ -2034,5 +2186,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 "Slip museknappen for at vælge objekterne inden i firkanten." @@ -2043,5 +2195,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 "Slip museknappen for at stoppe rotationen." @@ -2057,17 +2209,18 @@ msgstr "" +#: ../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 "Markering" -#: ../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 "Vælg, flyt og rotér objekter" -#: ../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" @@ -2076,25 +2229,29 @@ msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flyt elementer" -#: ../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" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Flyt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Fortryd flytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" +"Really move them?" +msgstr "" + +#: ../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." @@ -2103,5 +2260,5 @@ "nærmeste punkt." -#: ../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-" @@ -2127,60 +2284,60 @@ msgstr "" +#: ../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 "Søg..." -#: ../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 "Søg efter objekter." -#: ../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 "Indtast en søgetekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "erstat valgte" -#: ../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 "føj til valgte" -#: ../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 "fjern fra valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regulært udtryk" -#: ../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' og 'Street' i enhver nøgle eller navn." -#: ../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' i enhver nøgle eller navn." -#: ../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' hvor som helst i navnet." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2188,110 +2345,111 @@ msgstr "" -#: ../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 - intet 'Bak' i navnet." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "foot: - key=foot set to any value." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "Special targets:" msgstr "Specielle mål:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - alle objekter rettet af bruger" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objekt med det givne ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objekt med det givne ID" +msgid "nodes:... - object with given number of nodes" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "modified - all changed objects" msgstr "modified - alle ændrede objekter" -#: ../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 - alle valgte objekter" -#: ../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 - alle ufuldstændige objekter" +#: ../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:108 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" +msgid "Use | or OR to combine with logical or" +msgstr "" +"Brug | eller OR to for at forbinde med et logisk \"eller\"" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Brug | eller OR to for at forbinde med et logisk \"eller\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Brug \" for at angive operatorer (fx hvis key indeholder : )" -#: ../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 "Brug ( og ) for at gruppere udtryk" -#: ../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 "Søg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Start søgning" -#: ../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 "Intet resultat for \"{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 "Intet tilføjet til det valgte ved søgning efter \"{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 "Intet fjernet fra det valgte ved søgning efter \"{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 "Fandt {0} resultater" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "Ikke-versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "Regulært udtryk" @@ -2356,58 +2514,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Hent valgte" -#: ../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 "Kontakt {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Henter..." -#: ../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 "Kunne ikke læse fra URL: \"{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 "Fortolkningsfejl i URL: \"{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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Tilføj punkt" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Ret {0} objekt" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Seneste ændring ved {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Skift relation" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Fjern \"{0}\" for {1} \"{2}\"" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Fjern \"{0}\" for {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 "Fjern \"{0}\" for {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Sæt {0}={1} for {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 "Sæt {0}={1} for {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Sæt {0}={1} for {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" @@ -2416,10 +2612,10 @@ msgstr[1] "objekter" -#: ../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 "Fjern \"{0}\" for {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}" @@ -2431,5 +2627,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2438,10 +2634,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2450,5 +2646,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}''" @@ -2472,44 +2668,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slet {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slet {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] "Slet {0} {1}" +msgstr[1] "Slet {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] "Slette-tilstand" +msgstr[1] "Slette-tilstand" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Slet {0} {1}" +msgstr[1] "Slet {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] "Slet fra relation" +msgstr[1] "Slet fra relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Modstridende relation" -#: ../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 "Slet fra relation" + +#: ../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 "" "Markeringen \"{0}\" bruges af relationen \"{1}\" med rollen {2}.\n" "Slet fra relation?" -#: ../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 "Slet fra relation" - -#: ../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 "" "Markeringen \"{0}\" bruges af relationen \"{1}\".\n" "Slet fra relation?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Opdel vejstykke" @@ -2517,6 +2729,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." @@ -2528,5 +2740,5 @@ "måske bruger dem.
Vil du virkelig slette?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2537,5 +2749,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2570,10 +2782,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2586,17 +2808,37 @@ msgstr "Sekvens" -#: ../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 "Løs {0} tag-konflikter i {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 "Løs {0} tag-konflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Løs {0} tag-konflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Gendan {0} primitiver" -#: ../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 "Løs versionskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Løs versionskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Løs versionskonflikter for {0} {1}" @@ -2623,13 +2865,13 @@ "egenskaber foreslås ændret for at opretholde data-ensartethed." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relation" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Gammel rolle" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Ny rolle" @@ -2648,63 +2890,120 @@ #: ../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 "Ny værdi" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Udfør valgte ændringer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Undlad at udføre ændringer" -#: ../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 "Vælg hvilke ændringer af egenskaber som du vil gennemføre." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Egenskaber for " -#: ../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 "Automatisk tag-rettelse" -#: ../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 "Fejl i konfigurationsfilen ved linjerne {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åbne mappen for indstillinger: {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 "" "Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {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 "Indstillinger er gemt på {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 "Kunne ikke sende indstillinger. Årsag: {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 "Kunne ikke hente indstillinger fra serveren." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2718,29 +3017,36 @@ msgstr "" -#: ../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 "decimalgrader" -#: ../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 "Grader minutter sekunder" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "V" -#: ../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}" @@ -2752,15 +3058,229 @@ msgstr "" -#: ../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 "ufuldstændig" - -#: ../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 "Fejl: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Advarsel: {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 "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{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 "Der er ingen primitiver med versionen {0} i denne historik" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "parameteren \"{0}\" forventes i omfanget 0..{1}, modtog {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 "Fandt ikke en primitiv med id {0} i dette datasæt" + +#: ../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 "" + +#: ../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 "Parameteren \"{0}\" > 0 forventet, modtog \"{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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "En vej af typen Område er ikke lukket." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "multipolygon-vej \"{0}\" er ikke lukket." + +#. 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 "Tomt medlem i relation." + +#: ../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 "Slettede medlem \"{0}\" i relation" + +#: ../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 "Vej \"{0}\" med mindre end to punkter." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Mere end én \"fra\"-vej blev fundet." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Mere end én \"til\"-vej blev fundet." + +#: ../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 "Mere end én \"via\" blev fundet." + +#: ../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 "Ukendt rolle \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Ukendt medlemstype for \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Ingen \"fra\"-vej blev fundet." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Ingen \"til\"-vej blev fundet." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Intet \"via\"-punkt eller vej blev fundet." + +#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." + +#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." + +#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." + +#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Ikke-vej \"{0}\" i multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Ingen ydre vej for multipolygon \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Indre vej \"{0}\" er på ydersiden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "utagget" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "tekst" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inaktiv" + #: ../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" @@ -2769,22 +3289,7 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Fejl: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Advarsel: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "punkter" - -#: ../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" @@ -2793,12 +3298,7 @@ msgstr[1] "veje" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "veje" - -#: ../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" @@ -2807,246 +3307,4 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relationer" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "rettesæt" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "rettesæt" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} medlem" -msgstr[1] "{0} medlemmer" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "landevej" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "jernbane" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vandvej" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "brug af jord" - -#: ../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} punkt" -msgstr[1] "{0} punkter" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Der er ingen primitiver med versionen {0} i denne historik" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "parameteren \"{0}\" forventes i omfanget 0..{1}, modtog {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 "Fandt ikke en primitiv med id {0} i dette datasæt" - -#: ../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 "" - -#: ../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 "Parameteren \"{0}\" > 0 forventet, modtog \"{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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "En vej af typen Område er ikke lukket." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "multipolygon-vej \"{0}\" er ikke lukket." - -#. 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 "Tomt medlem i relation." - -#: ../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 "Slettede medlem \"{0}\" i relation" - -#: ../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 "Vej \"{0}\" med mindre end to punkter." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Mere end én \"fra\"-vej blev fundet." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Mere end én \"til\"-vej blev fundet." - -#: ../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 "Mere end én \"via\" blev fundet." - -#: ../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 "Ukendt rolle \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Ukendt medlemstype for \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Ingen \"fra\"-vej blev fundet." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Ingen \"til\"-vej blev fundet." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Intet \"via\"-punkt eller vej blev fundet." - -#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." - -#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." - -#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." - -#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Ikke-vej \"{0}\" i multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Ingen ydre vej for multipolygon \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Indre vej \"{0}\" er på ydersiden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "utagget" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "tekst" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inaktiv" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3059,5 +3317,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "baggrund" @@ -3067,5 +3325,5 @@ msgstr "fremhæv" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3075,5 +3333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3084,21 +3342,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert-zone (Frankrig)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert-zone (Estland)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3119,8 +3377,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3128,17 +3386,103 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Vis ikke igen" -#: ../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/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 "ufuldstændig" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "landevej" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "jernbane" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vandvej" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "brug af jord" + +#: ../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} punkt" +msgstr[1] "{0} punkter" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} medlem" +msgstr[1] "{0} medlemmer" + +#: ../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 "" "Kunne ikke oprette forbindelse til OSM-serveren {0}.\n" "Tjek server-URL'en i dine indstillinger samt din internetforbindelse." -#: ../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 "ukendt" + +#: ../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 "" @@ -3148,36 +3492,9 @@ msgstr "" -#: ../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 "ukendt" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3187,9 +3504,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 "" @@ -3198,9 +3515,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3209,9 +3526,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 "" @@ -3221,9 +3549,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Ukendt vært" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3233,12 +3561,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitiven er allerede slettet" - -#: ../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 @@ -3255,39 +3578,39 @@ msgstr "Henter \"Dagens besked\"" -#: ../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 "Upload indstillinger" -#: ../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 "Send de nuværende indstillinger til serveren" -#: ../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 "tekststreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Brugerens navn." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM-kodeord" -#: ../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 "" "Ret størrelsen af programmet til den angivne geometri (format: BREDDExHØJDE)" -#: ../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 "tekststreng;tekststreng;..." -#: ../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 " @@ -3297,5 +3620,5 @@ "eller et filnavn" -#: ../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 " @@ -3305,5 +3628,5 @@ "lat=y&lon=x&zoom=z eller et filnavn" -#: ../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 " @@ -3313,75 +3636,94 @@ "eller en URL som returnerer OSM-XML" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "enhver" -#: ../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 "Hvis angivet, nulstil konfigurationen i stedet for at indlæse den." -#: ../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 "Brugernavn" -#: ../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 "Kodeord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "brug" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "valgmuligheder" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Vis denne hjælp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Hent det omsluttende område" -#: ../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 "Hent lokaliteten fra URL'en (med 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 "Åbn fil (som rå GPS, hvis .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 "Hent det omsluttende område som rå 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 "Start op i maksimeret tilstand" -#: ../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 "Nulstil indstillingerne til standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Vælg sprog." -#: ../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 "eksempler" -#: ../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" @@ -3389,47 +3731,47 @@ msgstr "" -#: ../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 "I stedet for --download= kan du angive 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 "Aktiverer opdaterede udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Henter indledende udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Sætter standardværdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Henter udvidelser" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Filer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Funktioner" -#: ../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 "Forudindstillinger" -#: ../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 @@ -3441,21 +3783,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 "Trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Skift trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Skift fra og til Fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Lyd" @@ -3495,58 +3837,44 @@ msgstr "Zoom ud" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "skalér" -#: ../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 "Den geografiske længdegrad ved musemarkøren." -#: ../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 "Navnet på objektet ved musemarkøren." -#: ../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 "Den geografiske breddegrad ved musemarkøren." -#: ../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 "Vinklen mellem det forrige og det nuværende vejstykke." -#: ../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 "(Kompas)retningen af det tegnede linjestykke." -#: ../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 "Længden af det nytegnede vejstykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(intet objekt)" -#: ../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 "lag er ikke i listen" -#: ../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 "" - -#: ../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 "" @@ -3558,10 +3886,4 @@ msgid "File not found" msgstr "Filen blev ikke fundet" - -#: ../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 @@ -3621,7 +3943,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" @@ -3637,5 +3958,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" @@ -3738,5 +4059,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 "Min version" @@ -3747,5 +4068,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" @@ -3759,5 +4080,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 "Deres version" @@ -3832,6 +4153,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" @@ -3941,10 +4262,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 "uventet kolonne-indeks. Modtog {0}" -#: ../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 "" @@ -3953,19 +4274,19 @@ msgstr "" -#: ../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 "Ja, gendan også dem" -#: ../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 "Nej, fortryd handlingen" -#: ../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 "" @@ -3976,5 +4297,5 @@ "slettet på serveren.

Ønsker du også at gendanne disse punkter?" -#: ../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 "Gendan yderligere punkter?" @@ -3992,9 +4313,9 @@ msgstr "Gendan afhængige primitiver?" -#: ../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 " @@ -4002,110 +4323,112 @@ 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 "Koordinater:" -#: ../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 "ingen" -#: ../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 "slettet" -#: ../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 "ikke slettet" -#: ../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 "Behold mine koordinater" -#: ../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 "Behold deres koordinater" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4114,21 +4437,21 @@ msgstr "" -#: ../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 "Rolle" #: ../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 "Primitiv" @@ -4167,10 +4490,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 @@ -4179,10 +4503,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 @@ -4196,5 +4521,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}" @@ -4235,4 +4560,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "intet" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "alle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Vælg en farve" + +#: ../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 "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{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 "parameteren \"{0}\" må ikke være en null-værdi" + +#: ../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 "parameteren \"{0}\" forventes i omfanget 0..{1}, modtog {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 "ikke slettet" + +#: ../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 "Endnu ikke implementeret." + +#: ../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 "Tag veje som" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Slet fra relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikt i data" + +#: ../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} vej" +msgstr[1] "{0} veje" + +#: ../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} relation" +msgstr[1] "{0} relationer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Skift opløsning" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Løs konflikter" + +#: ../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 "Sæt ind" + +#: ../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} vej" +msgstr[1] "{0} veje" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4248,10 +4710,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 @@ -4259,5 +4721,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}" @@ -4290,36 +4752,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 "" @@ -4331,150 +4787,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 "Løs konflikter" -#: ../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 "Historik" -#: ../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 "Vis historikken for alle valgte elementer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Lag: {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 "Relationer: {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 "" - -#: ../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 "Genindlæs alle valgte objekter og genopfrisk listen." #. 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 "Lag" -#: ../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 "Åbn en liste af alle hentede lag." -#: ../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 "Slet det valgte lag." -#: ../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 "Slet lag" - -#: ../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 "" - -#: ../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 "Vis/skjul" -#: ../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 "Skift synligheden for det valgte lag." -#: ../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 "Flyt det valgte lag en række op." -#: ../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 "Flyt det valgte lag en række ned." -#: ../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." @@ -4483,28 +4907,22 @@ msgstr[1] "Dette vil ændre på op til {0} objekter." -#: ../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 "En tom værdi vil slette nøglen." -#: ../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 "Ret værdier?" -#: ../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" @@ -4513,89 +4931,84 @@ msgstr[1] "Ret egenskaber for op til {0} objekter" -#: ../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 "Vælg venligst en nøgle" -#: ../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 "Vælg venligst en værdi" -#: ../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 "Vælg de objekter, du vil rette egenskaber for." -#: ../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 "Egenskaber/medlemsskaber" -#: ../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 "Egenskaber for valgte objekter." #. 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 "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../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 "Tilføj" -#: ../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 "Tilføj et nyt nøgle/værdi-sæt til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Rediger egenskaber" -#: ../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 "Ret værdien for den valgte nøgle for alle objekter" -#: ../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 "Egenskaber: {0} / Medlemskaber: {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 "Egenskaber / Medlemskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Skift relation" -#: ../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 "Slet virkelig det valgte fra relation {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 "Fjern den valgte nøgle i alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Fjern egenskaber" @@ -4604,34 +5017,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 "Relationer" -#: ../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 "Åbn en liste over alle relationer" -#: ../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 "Relationer: {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 "Åbn en editor for den valgte relation" -#: ../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 "Slet de nvalgte relation" -#: ../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 "Opret en ny relation" -#: ../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 "" @@ -4664,23 +5077,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 "Markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} vej" -msgstr[1] "{0} veje" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relation" -msgstr[1] "{0} relationer" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4688,78 +5087,105 @@ msgstr "Valgt: {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 "Frigør panelet" -#: ../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." msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../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 "Klik for at minimere/maksimere panelet" -#: ../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 "Forfattere" -#: ../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 "Åbn en liste af brugere, der arbejder på de valgte objekter." -#: ../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] "Forfatter" +msgstr[1] "Forfatter" + +#: ../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 +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 "Mere information om denne feature" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Forfatter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Forfattere: {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 "Konflikt i data" -#: ../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 "" @@ -4768,47 +5194,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 " @@ -4817,14 +5237,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 "" @@ -4834,9 +5254,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 "" @@ -4846,15 +5266,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4862,5 +5282,5 @@ msgstr "" -#: ../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 " @@ -4868,20 +5288,20 @@ msgstr "" -#: ../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 "" @@ -4890,57 +5310,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 "Flyt det nuværende valgte medlem op" #. 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 "Flyt det nuværende valgte medlem ned" #. 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 " @@ -4949,9 +5369,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 "" @@ -4960,20 +5380,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 @@ -4983,37 +5399,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 "Hent alle ufuldstændige veje og punkter der er forbundet" -#: ../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 "Hent medlemmer" -#: ../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 "" @@ -5023,30 +5439,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 "" @@ -5060,22 +5476,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 "Henter indledende udvidelser" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5108,34 +5529,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] "Fjern gamle nøgler fra op til {0} objekt" -msgstr[1] "Fjern gamle nøgler fra op til {0} objekter" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bogmærker" -#: ../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 "Indtast venligst først de ønskede koordinater." -#: ../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 "Indtast et navn for stedet." -#: ../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 "Vælg først et bogmærke" @@ -5193,13 +5601,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 "Null pointer-fejl, sikkert på grund af nogle manglende tags." -#: ../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 "Indtast venligst en søgestreng" -#: ../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 "Kan ikke læse sted søgnings resultat fra serveren" @@ -5207,18 +5615,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 "Indtast et stednavn at søge efter:" -#. 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 "Steder" #. 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 "navn" @@ -5257,37 +5664,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 "type" -#: ../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 "nær" -#: ../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 "zoom" -#: ../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: " @@ -5296,5 +5703,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 "Flytbart kort" @@ -5321,46 +5728,74 @@ msgstr "Tern-nummer" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Send de nuværende indstillinger til serveren" + +#: ../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}" +#: ../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 "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5679,14 +6114,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5862,8 +6311,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" #. @@ -5960,4 +6415,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6071,6 +6529,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 @@ -6078,153 +6536,171 @@ #: 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 "Navn" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "rettesæt" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Mere information om denne feature" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Seneste ændring ved {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6233,32 +6709,286 @@ msgstr "" -#: ../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 "Vejnavn" + +#: ../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 "Vælg venligst en værdi" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parameteren \"{0}\" må ikke være en null-værdi" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Smid væk og afslut" + +#: ../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 "Gem og afslut" + +#: ../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 "Lag" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Ved upload" + +#: ../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 "Filer" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Sender" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Der er ingen valgte primitiver at opdatere." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Billeder for {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 "Indlæs 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 "Intet tidspunkt for punkt {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 "Kan ikke læse tidspunkt \"{0}\" for punkt {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 "Ingen billeder med læsbare tidsstempler fundet" -#: ../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 @@ -6266,29 +6996,29 @@ msgstr "Indlæser {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 "Geotaggede billeder" -#: ../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-start: {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-slut: {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 "nuværende forskel: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "tidszone-forskel: " -#: ../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" @@ -6297,14 +7027,14 @@ msgstr[1] "billeder" -#: ../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} inden for sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synkronisér ur" -#: ../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 @@ -6312,82 +7042,82 @@ msgstr "JPEG-billeder (*.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 "Datoen i filen \"{0}\" kunne ikke forstås." -#: ../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 "Der er intet EXIF-tidspunkt i filen \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Billede" -#: ../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 "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../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-enhedens tidszone (forskel fra foto)" -#: ../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 "Synkronisér tidspunkt med GPS-enhed" -#: ../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 "Den indtastede tid kunne ikke forstås." -#: ../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-punkt" -#: ../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 "Tilpas linjetegning" +#: ../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 "Brug globale indstillinger." + #: ../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 "Brug globale indstillinger." +msgid "Draw lines between points for this layer." +msgstr "Tegn linjer mellem punkter for dette lag." #: ../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 "Tegn linjer mellem punkter for dette lag." - -#: ../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 "Tegn ikke linjer mellem punkter for dette lag." -#: ../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 "Vælg linjetegnings-indstillinger" -#: ../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 "Tilpas farve" -#: ../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 "Standard" -#: ../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" @@ -6447,5 +7177,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}" @@ -6461,10 +7191,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 "Konvertér til datalag" #: ../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." @@ -6475,11 +7205,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 @@ -6521,4 +7251,9 @@ "du
at fortsætte?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Henter data" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6538,64 +7273,64 @@ msgstr "" -#: ../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 "Datalag {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 "uden for det hentede område" -#: ../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 "version {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 "" -#: ../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} består af:" -#: ../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} slettet.)" -#: ../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-version: {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 "Konvertér til GPX-lag" -#: ../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" @@ -6603,5 +7338,5 @@ msgstr[1] "spor" -#: ../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" @@ -6609,5 +7344,5 @@ msgstr[1] "punkter" -#: ../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" @@ -6616,5 +7351,5 @@ msgstr[1] "et spor med {0} punkter" -#: ../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" @@ -6623,5 +7358,5 @@ msgstr[1] "{0} består af {1} spor" -#: ../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" @@ -6630,9 +7365,9 @@ msgstr[1] "{0} punkter" -#: ../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-markør" -#: ../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" @@ -6640,5 +7375,5 @@ msgstr[1] "markører" -#: ../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" @@ -6659,5 +7394,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}." @@ -6665,5 +7400,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 "Kan ikke synkronisere i det afspillede lag." @@ -6691,5 +7426,5 @@ msgstr "Skift synligheden for markør-tekst og -ikoner" -#: ../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 " @@ -6697,5 +7432,5 @@ msgstr "" -#: ../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 " @@ -6703,29 +7438,29 @@ msgstr "" -#: ../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 "Kan ikke sætte ny audio-markør" -#: ../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 "Der opstod en fejl i forsøget på at vise URL'en for denne markør" -#: ../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 "(URL var: " -#: ../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 "Fejl ved visning af 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 "Udvidede indstillinger" -#: ../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 "Ret indstillingerne direkte. Vær varsom!" -#: ../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 @@ -6733,14 +7468,14 @@ msgstr "Søg: " -#: ../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 "Nuværende værdi er standard." -#: ../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 "Standardværdien er \"{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 "" @@ -6748,13 +7483,13 @@ "endnu)" -#: ../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 "Vælg venligst rækken, der skal rettes." -#: ../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 @@ -6762,14 +7497,14 @@ msgstr "Ny værdi for {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 "Vælg venligst rækken, der skal slettes" -#: ../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 "Indtast et nyt nøgle/værdi-sæt" @@ -6892,40 +7627,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 "Farve" -#: ../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 "" -#: ../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 "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Vælg" -#: ../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 "Vælg en farve for {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 "Sæt til standardværdi" -#: ../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 "Sæt alle til standardværdi" -#: ../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 "Farver brugt af forskellige objekter i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Farver" @@ -6969,5 +7704,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Bil" @@ -6989,16 +7724,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 "Cykel" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7028,12 +7764,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 "Gående" @@ -7213,5 +7949,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 "Vis startbillede ved opstart" @@ -7219,23 +7955,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 "Vis objekt-ID i lister" #: ../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 "Vis objekt-ID i lister" + +#: ../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 "Tegn elastik-hjælpelinje" -#: ../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 "Transaktionsløs tilstand (Potlatch-metode)" -#: ../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 "Vis objekt-ID i lister" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Udseende" @@ -7267,54 +8014,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 "Indstil tilgængelige udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Hent liste" -#: ../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 "Opdater" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Indstil sites..." -#: ../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 "Tilføj JOSM-udvidelsers beskrivelses-URL." -#: ../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 "Ret JOSM-udvidelesers beskrvelses-URL." -#: ../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 "Indstil udvidelses-sites" #. 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 "Indstillinger for visning" -#: ../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 " @@ -7324,41 +8071,41 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Indstillinger for forbindelse" -#: ../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 "Indstillinger for forbindelse til OSM-serveren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Indstillinger for kort" -#: ../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 "Indstilinger for projicering af kort og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Lydindstillinger" -#: ../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 "Indstillinger for lydafspiller og lydmarkører" -#: ../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 "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft." -#: ../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 "Vis koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projicerings-metode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Kort-projicering" @@ -7391,12 +8138,4 @@ msgid "Proxy server password" msgstr "Proxyserver-kodeord" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Basis URLen for OSM serveren (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Grundlæggende URL til server" #. 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 @@ -7423,61 +8162,60 @@ msgstr "Genvej" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "Vælg venligst rækken, som skal kopieres." -#: ../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 "" -#: ../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 "Slet den valgte kilde fra listen." -#: ../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 "" @@ -7651,36 +8389,59 @@ 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] "Fjern gamle nøgler fra op til {0} objekt" +msgstr[1] "Fjern gamle nøgler fra op til {0} objekter" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Tilføj en kommentar" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Slet det valgte lag." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Mere information om denne feature" #. 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 "Valgfri attributter:" -#: ../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 "Brug forudindstilling \"{0}\" af gruppe \"{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 "Brug forudindstilling \"{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 "Ukendt type: {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 @@ -7688,15 +8449,15 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {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 "Fejl ved fortolkning af {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 "Elementer af typen {0} er understøttet." -#: ../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 @@ -7706,22 +8467,22 @@ msgstr[1] "Ret {0} objekter" -#: ../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 "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Ret egenskaber" -#: ../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}''" @@ -7760,11 +8521,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 "Kunne ikke læse \"{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 " @@ -7774,38 +8535,38 @@ "GPL-licensen." -#: ../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 "GPX-filer" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "beskrivelse af gps-spor" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Angiv forfatter" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Rigtige navn" -#: ../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 "Ophavsret (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Forudindstillet" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "År for ophavsret" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Nøgleord" @@ -7815,9 +8576,9 @@ msgstr "Eksporter indstillinger" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Eksporter og gem" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7828,10 +8589,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 "Vælg en forudangivet licens" -#: ../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 @@ -7841,12 +8602,12 @@ msgstr "Markører fra {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 "" -#: ../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" @@ -7867,6 +8628,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 @@ -7876,20 +8637,40 @@ msgstr "Downloader OSM-data..." -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Intet tilføjet til det valgte ved søgning efter \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7897,34 +8678,34 @@ msgstr "" -#: ../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-filer" -#: ../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 "Koordinater importeret: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Defekte sætninger: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Fejl ved kontrolsum: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Ukendte sætninger: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Ingen kooordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA-import succesfuld" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Fejl ved NMEAimport!" @@ -7935,9 +8716,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7946,15 +8727,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7962,33 +8743,91 @@ msgstr "" -#: ../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 "Åbner rettesæt..." -#: ../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 "Åbner rettesæt..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Åbner rettesæt..." + +#: ../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 "Åbner rettesæt..." + +#: ../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 "Lukker rettesæt..." -#: ../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 "Lukker rettesæt..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Åbner rettesæt..." + +#: ../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 "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Uploader..." -#: ../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}." @@ -8016,29 +8855,33 @@ msgstr "Ugyldig bz2-fil." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Forkert brugernavn eller kodeord" -#: ../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 "Advarsel: Kodeordet sendes ukrypteret." -#: ../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 "Gem brugernavn og kodeord (ukrypteret)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Indtast kodeord" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Login" -#: ../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 "Basis URLen for OSM serveren (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Login-navn (e-mail) til OSM-kontoen." -#: ../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." @@ -8047,13 +8890,17 @@ "kodeord." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Grundlæggende URL til server" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM-brugernavn (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-kodeord" -#: ../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." @@ -8062,20 +8909,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM-serverfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8084,5 +8931,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8276,35 +9123,46 @@ "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse." -#: ../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} tilbage. Uploader {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} tilbage. Uploader {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} tilbage. Uploader {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 "Intet at sende. Skab først noget data." + +#: ../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 "Opdater udvidelser" -#: ../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 "Hent udvidelser" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8317,5 +9175,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." @@ -8324,23 +9182,23 @@ msgstr[1] "{0} udvidelser blev succesfuldt hentet ned. Genstart venligst 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 "Henter udvidelsen {0}..." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM-version {0} er krævet for udvidelsen {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Hent udvidelse" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "" @@ -8351,30 +9209,30 @@ msgstr "En fejl opstod i udvidelsen {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 "Udvidelsen {0} kræver at JOSM skal opdateres til version {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 "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet." -#: ../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 "Udvidelsen blev ikke fundet: {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 "Seneste udvidelsesopdatering mere end {0} dage siden." -#: ../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 " @@ -8384,21 +9242,21 @@ "indstillingen '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 "Deaktivér udvidelse." -#: ../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 "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Behold udvidelse" -#: ../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 " @@ -8408,5 +9266,5 @@ "til at overskrive de eksisterende udvidelser." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8414,10 +9272,10 @@ msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen." -#: ../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 "Ifølge udvidelsen medfølgende information, så er {0} forfatteren." -#: ../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." @@ -8426,9 +9284,9 @@ "fejlrapport." -#: ../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 "Skal udvidelsen deaktiveres?" -#: ../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 " @@ -8438,13 +9296,13 @@ "udvidelsen." -#: ../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" @@ -8455,5 +9313,5 @@ msgstr "Flere detaljer" -#: ../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" @@ -8462,18 +9320,18 @@ msgstr[1] "Hent udvidelsesinformationer fra {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Ingen udvidelsesinformationer blev fundet." -#: ../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 "" -#: ../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 "Alle installerede udvidelser er opdaterede." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8486,9 +9344,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 "Hent manglende udvidelser" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8501,35 +9359,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}: Version {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 "Udvidelse som følger med 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 "Fejl ved indlæsning af fil med udvidelsesinformationer: {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 "Dette er efter afslutningen på optagelsen" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Fejl ved lydafspilning" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Foretag intet" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Rapportér fejl" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8543,19 +9401,19 @@ "udgave af JOSM, kan du hjælpe ved at sende en fejlrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Uventet handling" -#: ../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 "Send venligst en fejlrapport på {0}" +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +msgid "Include your steps to get to the error (as detailed as possible)!" +msgstr "" +"Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!" + #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 -msgid "Include your steps to get to the error (as detailed as possible)!" -msgstr "" -"Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8565,13 +9423,13 @@ "indsender en fejlrapport." -#: ../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 "Husk at nævne følgende informationer:" -#: ../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 "(teksten er allerede kopieret til til din udklipsholder.)" -#: ../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}." @@ -8579,6 +9437,6 @@ "Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {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 "" @@ -8587,5 +9445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8594,5 +9452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8605,5 +9463,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" @@ -8613,5 +9471,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8622,21 +9480,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 "(Tip: Du kan redigere genveje i indstillingerne.)" -#: ../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 "" @@ -8663,9 +9556,27 @@ msgstr "Opret et gitter af veje" -#: ../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 "Send sporing" -#: ../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 @@ -8673,27 +9584,40 @@ msgstr "Send sporinger" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Offentlig" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in 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 "Beskrivelse" -#: ../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 "Indtast en beskrivelse af din sporing." -#: ../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 "Indtast nogle nøgleord om din sporing" -#: ../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}" @@ -8701,47 +9625,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 "Forbinder..." -#: ../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 "Opdatering afbrudt" -#: ../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 "Fejl under upload" -#: ../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-upload lykkedes" -#: ../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 "Upload fejlede. Serveren angav følgende besked: " -#: ../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 "Sender GPX-spor: {0}% ({1} af {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 "Ingen beskrivelse er angivet. Tilføj venligst en beskrivelse." -#: ../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 "Intet GPX-lag er valgt. Kan ikke sende sporingen." -#: ../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 "Intet brugernavn er angivet." -#: ../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 "Intet kodeord er angivet." -#: ../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 "Sender GPX-spor" @@ -8854,19 +9778,19 @@ msgstr "Hent billedsæt som et nyt lag." -#: ../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-filer (*.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 "Filen {0} er hentet, dog under navnet \"{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 "Fejl ved indlæsning {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." @@ -8878,34 +9802,34 @@ "vælg en tidszone
" -#: ../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 "Tidspunkt for foto (fra 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-tidspunkt (aflæst fra ovenstående foto): " -#: ../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 " [dd/mm/åååå tt:mm:ss]" -#: ../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 "Jeg er i tidszonen: " -#: ../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 "Ingen dato" -#: ../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 "Åbn et andet foto" -#: ../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 "Synkronisér tiden fra et billede på GPS-modtageren" -#: ../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" @@ -8915,70 +9839,70 @@ "Brug venligst det angivne format" -#: ../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 "Ugyldig dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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-spor: " -#: ../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 "Åben endnu en GPX-sporing" -#: ../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 "Tidszone: " -#: ../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 "Forskydning:" -#: ../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 "" "Jeg kan tage et billede af min GPS-modtager.
Hjælper det?" -#: ../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 "Opdater position for: " -#: ../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 "Alle billeder" -#: ../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 "Billeder uden EXIF-position" -#: ../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 "Endnu ikke taggede billeder" -#: ../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 "Tilpas billeder med GPX-spor" -#: ../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 "Sammenhold" -#: ../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 "Automatisk gæt" -#: ../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 "Du bør vælge et GPX-spor" -#: ../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 "Intet valgt GPX-spor" -#: ../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 "" @@ -8989,9 +9913,9 @@ "Forventet format: {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 "Ugyldig tidszone" -#: ../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 "" @@ -9002,65 +9926,65 @@ "Forventet format: {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 "Ugyldig forskydning" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX-spor hentet" -#: ../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 "Det valgte billede rummer ingen tidsangivelse" -#: ../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 "Billederne rummer ingen tidsangivelser" -#: ../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." msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." -#: ../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-sporet har ingen tidsangivelser." -#: ../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 "Tidszone: {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 "Minutter: {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 "Sekunder: {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 "" -#: ../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 "(Tidsforskel på {0} dage)" -#: ../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 "Forskydning mellem spor og billeder: {0}m {1}s" -#: ../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 " @@ -9068,13 +9992,13 @@ msgstr "" -#: ../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 "Justér tidszone og forskydning" -#: ../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 "Standardværdier" @@ -9095,5 +10019,5 @@ msgstr "Fejl i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9106,12 +10030,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 "Vælg alt" - -#: ../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 "Fejl ved indlæsning af fil" @@ -9140,8 +10063,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 "" "Byen {0} blev ikke findet eller er ikke tilgængelig i WMS.\n" @@ -9152,21 +10075,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 "Vælg fra..." -#: ../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" @@ -9175,37 +10098,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 "" -#: ../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 "Tilvælg automatisk caching." -#: ../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 "Maks. cachestørrelse (i MB)" -#: ../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." @@ -9217,18 +10151,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Kilde" -#: ../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 " @@ -9238,5 +10172,5 @@ "defineret i JOSM-indstillingerne." -#: ../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). " @@ -9244,39 +10178,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "Fast størrelse (fra 25 til 1.000 meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9333,12 +10267,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Kontakter WMS-server..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "billedet er ikke indlæst" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9372,20 +10304,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" @@ -9393,9 +10325,14 @@ 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 +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" @@ -9403,31 +10340,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 "Indtast længde/bredde for at springe til position." - -#: ../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 "øst" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "nord" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Behold deres koordinater" +msgid "Set " +msgstr "Markering" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9489,6 +10434,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)" @@ -9510,6 +10455,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 "Tomt lag" @@ -9525,7 +10470,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Lag: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10045,6 +10990,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 "vand" @@ -10057,8 +11002,4 @@ msgid "land" msgstr "land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "intet" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10342,9 +11283,9 @@ msgstr "OpenStreetBugs download-løkke" -#: ../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 "" -#: ../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 " @@ -10353,5 +11294,5 @@ msgstr "" -#: ../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 "" @@ -10914,5 +11855,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 "Vejnavn" @@ -10931,29 +11872,29 @@ msgstr "Vis forfatterpanel" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Åbn brugerside" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Åbn brugerside i browser" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Vælg brugerens data" -#: ../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 "Vælg venligst noget data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Vælg venligst en bruger fra forfatter-panelet" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Beklager, virker ikke med anonyme brugere" @@ -10967,23 +11908,15 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "DETTE ER PÅ FORSØGSBASIS. Gem dit arbejde og bekræft før afsendelse" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Fortsæt alligevel" - -#: ../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 "Kun op til to områder kan sammensættes i øjeblikket" -#: ../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}\" er ikke lukket og kan derfor ikke blive forbundet." -#: ../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" @@ -10992,38 +11925,38 @@ msgstr "" -#: ../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 "Fortryd venligst, hvis du ikke er sikker" -#: ../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 "Vælg mindst en lukket vej, som skal forbindes." -#: ../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 "Tilføjede punkter ved alle kryds" -#: ../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 "Slet veje, som ikke er en del af en indre multipolygon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Ret relationer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Sammenlagde selv-overlappende område" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Sammensatte overlappende områder" -#: ../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 " @@ -11031,81 +11964,81 @@ msgstr "" -#: ../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 "Fjernede element fra relationer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Sammenlæg områder: Fjern korte veje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Lukket vej" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Fjern tags fra indre veje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funktion til sammenlægning af områder" -#: ../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 "Indtast længde/bredde for at springe til position." -#: ../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 "Du kan også indsætte en URL fra www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (i meter)" -#: ../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 "Spring hertil" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Hop til position" -#: ../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 "Kunne ikke aflæse længde, bredde eller zoom. Tjek venligst." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Kunne ikke aflæse længde/bredde" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Forenkl vej" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Slet unødige punkter fra en vej." -#: ../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?" @@ -11115,25 +12048,25 @@ msgstr[1] "" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Er du sikker?" -#: ../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 "Valideringsfejl" -#: ../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 "Ingen valideringsfejl" -#: ../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 "Gitter" -#: ../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 "" @@ -11223,53 +12156,53 @@ msgstr "Foretager datavalidering" -#: ../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 "Data med fejl. Send alligevel?" -#: ../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 "Åbn valideringsvindue" -#: ../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 "Zoom til problem" -#: ../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 "Ret" -#: ../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 "Ret de valgte fejl." -#: ../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 "Ignorér" -#: ../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 "Ignorér de valgte fejl næste gang." -#: ../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 "Hele gruppen" -#: ../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 "Enkelte elementer" -#: ../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 "Intet" -#: ../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 "Ignorér hele gruppen eller enkelte elementer?" -#: ../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 "Ignorerer elementer" -#: ../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" @@ -11293,25 +12226,60 @@ #: ../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 "" "Denne test undersøger om to veje, jernbaner eller vandveje krydser i det " "samme lag, uden at være forbundet til samme punkt." -#: ../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 "Opret bygninger" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Krydsende veje" -#: ../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 "Dublet-punkter" -#: ../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 "" "Denne test tjekker at der ikke er nogen punkter, som ligger på præcis samme " "sted." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Punkter med samme navn" + +#: ../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 "Dupliker vej" + +#: ../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 "" +"Denne test tjekker at der ikke er nogen punkter, som ligger på præcis samme " +"sted." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Opret kopi af vej" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11399,23 +12367,23 @@ "Denne test tjekker for veje med lignende navne, som kan være stavet forkert." -#: ../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 "Egenskabstjekker:" -#: ../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 "Denne udvidelse tjekker for fejl i egenskabsnøgler og -værdier" -#: ../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 "Ugyldig tagtjekker-linje - {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 "Ugyldig stavefejlskontrol-linje: {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 "" @@ -11426,7 +12394,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 "Ugyldig kombination af tag/værdi" @@ -11434,80 +12402,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 "Farvelægger problem" -#: ../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 "Nøgle \"{0}\" er ugyldig" -#: ../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 "Tags med tomme værdier" -#: ../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 "Ulovlig egenskabsnøgle" -#: ../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 "Ulovligt blanktegn i egenskabsnøgle" -#: ../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 "Egenskabsværdi begynder eller slutter med blanktegn" -#: ../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 "Egenskabsværdi indeholder HTML-kodet tegn" -#: ../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 "Nøglen \"{0}\" er ikke kendt i forudindstillingerne" -#: ../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 "Forudindstillingerne rummer ikke egenskabs-nøglen" -#: ../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 "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne" -#: ../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 "Værdien er ikke kendt i forudindstillingerne" -#: ../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 "Tjek egenskabsnøgler" -#: ../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 "Bekræft egenskabsnøglernes gyldighed op imod en ordliste." -#: ../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 "Brug kompleks egenskabs-tjekker." -#: ../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-kilde" -#: ../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." @@ -11515,82 +12483,82 @@ msgstr "" -#: ../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 "Tilføj en ny kilde til listen." -#: ../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 "Ret den valgte kilde." -#: ../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 "Datakilder" -#: ../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 "Tjek egenskabsværdier." -#: ../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 "" -#: ../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 "Tjek for 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 "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Brug standard-datafil." -#: ../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 "Brug standard-datafilen (anbefales)." +#: ../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 "Brug standard-fil for stavekontrol." -#: ../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 "Brug standard-filen for stavekontrol (anbefales)." -#: ../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 "Ret egenskaber" -#: ../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 "Kunne ikke finde element-typen" -#: ../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 "Kunne ikke finde advarsels-niveau" -#: ../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 "Ugyldigt udtryk ''{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}''" @@ -11735,7 +12703,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 "bygning" @@ -11749,5 +12717,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 "område" @@ -11884,5 +12852,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "En undtagelse opstod" @@ -11927,14 +12895,14 @@ msgstr "" -#: ../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 "Korrigeret billede..." -#: ../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}" @@ -11945,26 +12913,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 "Selvvalgt WMS-link" -#: ../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 "Besøg hjemmeside" -#: ../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 eller billede-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 " @@ -11972,37 +12940,55 @@ msgstr "" -#: ../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 "Ingen gyldig WMS-URL eller id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Tilpas 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 "Tilpas positionen for det valgte WMS-lag" -#: ../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 "" @@ -12015,15 +13001,43 @@ msgstr "Automatisk download" -#: ../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 "designeret" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lag ({0}), henter automatisk til zoom {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-lag ({0}), henter til zoom {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 "Ugyldig dato" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12032,89 +13046,100 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Gem WMS-lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Hent WMS-lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Hent WMS-lag" -#: ../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}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Fil format fejl" -#: ../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 "Åbn et tomt WMS-lag for at hente data fra en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Indstillinger for WMS-udvidelse" -#: ../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 "Ret listen over WMS-servere, som vises i WMS-udvidelsesmenuen" -#: ../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 "Navn på menu" -#: ../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-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Navn på menu (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS-URL (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Kopier standardværdi" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Vælg mindst én vej." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12492,62 +13517,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 "Reference" - -#. 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 "Lag" #. item "Streets/Motorway" combo "Layer" @@ -12562,5 +13532,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 "Baner" @@ -12575,5 +13545,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" @@ -12583,10 +13552,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 "Maks. hastighed (km/t)" @@ -12630,9 +13599,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 "Ensrettet" @@ -12680,13 +13649,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 "Bro" @@ -12728,13 +13697,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 "Tunnel" @@ -12774,12 +13743,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 "Indhak" @@ -12819,12 +13788,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 "Vold" @@ -12980,17 +13949,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 "Bredde (meter)" @@ -13017,4 +13986,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" @@ -13033,11 +14003,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 "Overflade" @@ -13047,4 +14018,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" @@ -13059,9 +14031,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 "asfalteret" @@ -13069,10 +14042,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 "uasfalteret" + +#: 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 "Feriehytte" + +#: 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 "beton" + +#: 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 "Udlejning" + +#. 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 "træ" + +#: 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 "P-automat" #. item "Ways/Track Grade 2" combo "Surface" @@ -13080,12 +14116,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 "toppede brosten" + +#: 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 "grus" + +#: 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 "toppede brosten" + +#: 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 "ufuldstændig" + +#: 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 "græs" + +#: 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 "græs" + +#: 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 "sand" + +#. 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 "jord" #. item "Streets/Residential" text "Width (meters)" @@ -13166,20 +14284,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Adgangsbegrænsninger" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Ret adgangsbegrænsninger" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Betalingsanlæg" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Blind vej" @@ -13192,8 +14310,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 "Adgang" @@ -13228,32 +14346,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 "ja" @@ -13266,40 +14399,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 "privat" -#: 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 "designeret" @@ -13312,19 +14445,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 "destination" @@ -13347,65 +14480,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 "tilladt" -#: 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 "landbrug" -#: 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 "nej" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Varer" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Lastbil" @@ -13420,10 +14558,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 "Hest" @@ -13439,17 +14577,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 "Motorcykel" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13461,30 +14598,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 "Motorkøretøj" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Offentlig transport" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorbåd" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Båd" #. 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 "Min. hastighed (km/t)" @@ -13492,25 +14629,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 "Maks. vægt (ton)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Maks. højde (meter)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Maks. bredde (meter)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Maks. længde (meter)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rundkørsel" @@ -13521,5 +14658,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 "Ret trafikknudepunkt" @@ -13535,5 +14672,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" #. @@ -13541,9 +14678,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 "Type" @@ -13563,10 +14700,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 "motorvej" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorvejsforbindelse" @@ -13588,10 +14725,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 "forbindelse" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "" @@ -13613,10 +14750,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 "primær" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "" @@ -13638,5 +14775,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" @@ -13651,9 +14788,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "tertiær" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "" @@ -13667,9 +14804,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "beboelse" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "" @@ -13699,10 +14836,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 "" @@ -13732,6 +14869,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 "" @@ -13742,10 +14879,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 "Ret bro" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Ret en tunnel" @@ -13753,19 +14890,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Stier" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Under udførelse" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Ret vej under udførelse" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Kryds" @@ -13781,5 +14918,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rundkørsel" @@ -13788,5 +14925,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Ridesti" @@ -13794,5 +14931,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Ret ridesti" @@ -13800,5 +14937,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Cykelsti" @@ -13808,11 +14945,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 "Ret cykelsti" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Gågade" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Gangsti" @@ -13821,11 +14964,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Ret gangsti" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pigge" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Gågade" @@ -13834,5 +14983,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Ret gågade" @@ -13840,5 +14989,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Trin" @@ -13848,5 +14997,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 "Ret trappetrin" @@ -13855,5 +15004,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Spor" @@ -13862,39 +15011,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Ret spor" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "beton" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "grus" - -#. 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 "jord" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "græs" - -#: 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 "sand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Spor-niveau 1" @@ -13903,5 +15024,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Ret et spor af første niveau" @@ -13909,5 +15030,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Spor-niveau 2" @@ -13916,5 +15037,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Ret et spor af andet niveau" @@ -13922,5 +15043,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Spor-niveau 3" @@ -13929,5 +15050,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Ret et spor af tredje niveau" @@ -13935,5 +15056,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Spor-niveau 4" @@ -13942,5 +15063,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Ret et spor af fjerde niveau" @@ -13948,5 +15069,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Spor-niveau 5" @@ -13955,5 +15076,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Ret et spor af femte niveau" @@ -13962,5 +15083,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Sti" @@ -13969,19 +15090,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Ret sti" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Motorslæde" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. 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 "Vandring" @@ -13991,5 +15115,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 "Ret vandring" @@ -13997,5 +15121,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Bjergvandring" @@ -14005,5 +15129,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 "Ret bjergvandring" @@ -14011,5 +15135,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Krævende bjergvandring" @@ -14019,5 +15143,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 "Ret krævende bjergvandring" @@ -14025,5 +15149,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Alpevandring" @@ -14033,5 +15157,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 "Ret alpevandring" @@ -14039,5 +15163,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Krævende alpevandring" @@ -14047,5 +15171,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 "Ret krævende alpevandring" @@ -14053,5 +15177,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Hård alpevandring" @@ -14061,5 +15185,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 "Ret hård alpevandring" @@ -14067,10 +15191,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Vejpunkter" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Motorvejskryds" @@ -14078,15 +15202,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Ret motorvejskryds" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Tankstation" @@ -14094,5 +15218,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Ret tankstation" @@ -14106,4 +15230,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" #. @@ -14123,18 +15249,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 "Selskab" @@ -14143,5 +15271,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Færdselssignal" @@ -14151,5 +15279,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Type af fodgængerfelt" @@ -14158,27 +15286,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 "helleanlæg" -#: 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 "" @@ -14186,6 +15314,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 "" @@ -14194,11 +15322,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 "" @@ -14206,30 +15334,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 "fodgængerfelt" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "fodgængerfelt med trafikstyring" -#: 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 "Stop" @@ -14237,5 +15365,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Fodgængerfelt" @@ -14244,14 +15372,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rundkørsel" @@ -14262,14 +15390,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 "Retning" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "i urets retning" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Vendeplads" @@ -14279,20 +15407,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 "Bygrænse" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Ret et bygrænse-skilt" #. 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 "Fartkamera" @@ -14300,5 +15428,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Nødtelefon" @@ -14306,5 +15434,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14312,5 +15440,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14319,10 +15447,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Vadested" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Ret vadested" @@ -14330,5 +15458,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Bjergpas" @@ -14336,5 +15464,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Ret bjergpas" @@ -14342,11 +15470,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 "Højde" @@ -14354,5 +15482,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barrierer" @@ -14360,5 +15488,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Pæl" @@ -14366,5 +15494,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Ret en pæl" @@ -14409,16 +15537,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 "Tilladt trafik:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "" @@ -14427,5 +15555,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14433,5 +15561,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Kreaturrist" @@ -14439,10 +15567,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Ret en kreaturrist" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bussluse" @@ -14450,15 +15578,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pigge" #. 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 "Betalingsanlæg" @@ -14466,5 +15594,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Ret betalingsanlæg" @@ -14472,10 +15600,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Grænsekontrol" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Ret grænsekontrol" @@ -14485,5 +15613,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Hæk" @@ -14492,5 +15620,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Hegn" @@ -14499,5 +15627,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mur" @@ -14505,5 +15633,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Bymur" @@ -14512,5 +15640,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Støttemur" @@ -14522,15 +15650,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Indgang" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Ret indgang" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Port" @@ -14538,50 +15666,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Ret en port" #. 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 "Skubbeport" #. 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 "Stente" @@ -14589,25 +15717,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Ret en stente" #. 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 "Udfaldsport" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Ret en udfaldsport" @@ -14618,10 +15746,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 "Vand" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Udspring" @@ -14629,5 +15757,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Ret udspring" @@ -14635,5 +15763,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Dræn" @@ -14641,10 +15769,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Ret dræn" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Strøm" @@ -14652,10 +15780,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Ret strøm" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -14663,10 +15791,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Ret kanal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Flod" @@ -14676,5 +15804,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 "Ret flod" @@ -14682,15 +15810,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Ret vand" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Ret land" @@ -14698,15 +15826,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 "Vandreservoir" @@ -14714,15 +15842,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Ret område for vandreservoir" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Overdækket reservoir" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Ret overdækket reservoir" @@ -14730,5 +15858,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Flodbred" @@ -14737,10 +15865,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Ret flodbred" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Vådområde" @@ -14751,14 +15879,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 "Ret vådområde" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Sump" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "mose" @@ -14772,35 +15900,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 "saltmarsk" -#: 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 "Mudder" #. 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 "Strand" @@ -14808,20 +15936,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Ret strand" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Bugt" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Ret bugt" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Klippe" @@ -14829,10 +15957,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Ret klippe" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Kystlinje" @@ -14840,5 +15968,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Ret kystlinje" @@ -14846,5 +15974,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Færgerute" @@ -14852,5 +15980,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Ret færge" @@ -14859,5 +15987,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14865,10 +15993,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 "Dok" @@ -14876,5 +16004,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Ret dok" @@ -14882,5 +16010,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Dæmning" @@ -14888,15 +16016,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Ret dæmning" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Vandvejs-punkt" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "" @@ -14905,5 +16033,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14911,20 +16039,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 "Vandfald" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Ret vandfald" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "" @@ -14933,15 +16061,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Lystbådehavn" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Ret lystbådehavn" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Mole" @@ -14949,10 +16077,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Ret mole" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Færgehavn" @@ -14960,10 +16088,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Ret færgehavn" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Slæbested" @@ -14973,5 +16101,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 "Ret slæbested" @@ -14979,10 +16107,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Jernbane" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Spor" @@ -14990,5 +16118,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Ret spor" @@ -15018,8 +16146,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 "Valgfri typer" @@ -15033,35 +16161,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 "sidespor" -#: 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 "Monorail" @@ -15069,45 +16197,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Ret monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Bevaret" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Ret bevaret jernbane" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Letbane" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Ret letbane" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Ret metro" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Sporvogn" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Ret sporvogn" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Styreskinne til bus" @@ -15115,5 +16243,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Ret styreskinne til bus" @@ -15122,14 +16250,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Ubrugt jernbanespor" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Ret ubrugt jernbanespor" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Fjernet jernbane" @@ -15138,5 +16266,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Jernbaneoverskæring" @@ -15145,5 +16273,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Fodgængerovergang" @@ -15153,5 +16281,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15159,5 +16287,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Drejeskive" @@ -15166,10 +16294,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Luftvej" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Skilift" @@ -15177,10 +16305,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Ret skilift" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Træklift" @@ -15188,10 +16316,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Ret træklift" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Tovbane" @@ -15199,10 +16327,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Ret tovbane" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15210,5 +16338,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15216,5 +16344,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 "Station" @@ -15225,10 +16353,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 "Ret station" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Benzin" @@ -15238,9 +16366,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 "Ret benzin" #. 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 "Åbningstider" + +#. 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" @@ -15260,106 +16617,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Ret parkering" #. 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 "fleretages" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "overflade" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Markér som udført" + +#. 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 "Gebyr" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapacitet" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Handicapplads" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Handicapplads" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Handicapplads" + +#: 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 "Vask" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Ret bilvask" + +#. 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 "Bilmekaniker" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Ret bilmekaniker" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Udlejning" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Ret biludlejning" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Deling" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Ret cykelparkering" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapacitet" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "overflade" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "fleretages" - -#: 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 "Handicapplads" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Gebyr" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Vask" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Ret bilvask" - -#. 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 "Bilmekaniker" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Ret bilmekaniker" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Udlejning" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Ret biludlejning" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Deling" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Ret cykelparkering" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Ret cykeludlejning" @@ -15368,15 +16760,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Ret cykelhandler" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Offentlig transport" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-reference" @@ -15384,5 +16776,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Jernbane-stop" @@ -15390,5 +16782,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Ret stop" @@ -15396,5 +16788,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Sporvogns-stop" @@ -15403,5 +16795,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Ret sporvogns-stop" @@ -15409,5 +16801,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Jernbaneplatform" @@ -15416,5 +16808,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Redigér jernbaneplatform" @@ -15426,5 +16818,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 "Spornummer" @@ -15432,10 +16824,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 "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Indgang til undergrundsbane" @@ -15444,10 +16836,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Ret indgang til undergrundsbane" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "kørestol" @@ -15456,5 +16848,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Rutebilstation" @@ -15463,5 +16855,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Ret rutebilstation" @@ -15469,5 +16861,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Busstop" @@ -15477,5 +16869,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 "Ret busstop" @@ -15484,8 +16876,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 "" @@ -15493,10 +16883,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Rutebil-platform" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Ret rutebil-platform" @@ -15504,5 +16894,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15510,5 +16900,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Ret taxiholdeplads" @@ -15516,5 +16906,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Lufthavn" @@ -15522,15 +16912,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Ret lufthavn" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15539,5 +16929,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Overnatning" @@ -15549,5 +16939,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -15556,15 +16946,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Ret hotel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stjerner" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -15572,20 +16962,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Ret motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Gæstehus" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Ret gæstehus" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Feriehytte" @@ -15593,10 +16983,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Ret feriehytte" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Vandrerhjem" @@ -15604,30 +16994,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Ret vandrerhjem" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Alpin hytte" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Redigér alpin hytte" #. 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 "Camping plads" @@ -15635,10 +17025,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Redigér camping plads" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Mad+drikke" @@ -15649,5 +17039,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -15655,5 +17045,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Ret restaurant" @@ -15661,5 +17051,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 "Køkken" @@ -15667,61 +17057,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 "italiensk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "kinesisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "burger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "græsk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "tysk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indisk" -#: 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 "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "tyrkisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexicansk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japansk" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fastfood" @@ -15729,9 +17119,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Ret fastfood-restaurant" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Café" @@ -15739,10 +17129,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Ret café" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -15750,20 +17139,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Ret pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Ølhal" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Redigér Ølhal" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -15771,10 +17158,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Redigér bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Natklub" @@ -15782,33 +17168,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Ret natklub" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turisme" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Forlystelse" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Ret forlystelse" -#. 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 "Åbningstider" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -15816,10 +17193,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Ret museum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -15828,10 +17204,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Ret zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Udsigtspunkt" @@ -15839,25 +17214,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Redigér udsigtspunkt" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Udkigstårn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Forlystelsespark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Ret forlystelsespark" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Kunstværk" @@ -15865,5 +17239,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Redigér kunstværk" @@ -15871,86 +17245,210 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Informationskontor" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Redigér informationskontor" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Kort" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Kort type" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "kort" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "bykort" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "vandrekort" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "cykelkort" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "gade" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "kinesisk" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Hent område" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Sæt ind" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "By" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "Region" #. 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 "Nærmere beskrivelse" #. 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 "Cykling" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Bjergvandring" + +#. 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 "Skisport" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "bygning" + +#. 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 "Grænsekontrol" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "nybegynder" + +#: build/trans_presets.java:1737 msgid "history" msgstr "historie" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "natur" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "dyreliv" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "brug af jord" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Oplysninger" + +#. 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 "Nærmere beskrivelse" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Lyd" + +#. +#: 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 "Telefonnummer" + +#. 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 "" @@ -15958,25 +17456,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 "Bålplads" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Picnic sted" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Redigér picnic sted" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historiske steder" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Borg" @@ -15985,20 +17483,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Ret borg" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruiner" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Ret ruiner" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Arkæologisk sted" @@ -16007,10 +17504,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Ret arkæologisk sted" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Slagmark" @@ -16018,5 +17514,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Ret slagmark" @@ -16024,15 +17520,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Ret monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Mindesmærke" @@ -16040,45 +17536,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Ret mindesmærke" #. 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 "Rekreation" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Badeland" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Ret badeland" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Legeplads" @@ -16086,15 +17582,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Ret legeplads" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Fiskeri" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Ret fiskeri" @@ -16102,15 +17598,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sportsfaciliteter" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Ret stadion" @@ -16124,6 +17620,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 "vælg sportsgren:" @@ -16515,30 +18011,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 "sport" @@ -16548,227 +18044,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 "multi" -#: 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 "bueskydning" -#: 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 "atletik" -#: 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 "australsk fodbold" -#: 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 "baseball" -#: 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 "basketball" -#: 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 "petanque" -#: 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 "kano" -#: 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 "klatring" -#: 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 "cricket" -#: 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 "kroket" -#: 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 "hundeløb" -#: 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 "ridning" -#: 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 "golf" -#: 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 "gymnastik" -#: 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 "travbane" -#: 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 "motor" -#: 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 "pelota" -#: 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 "rugby" -#: 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 "skydebane" -#: 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 "skateboard" -#: 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 "skating" -#: 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 "skisport" -#: 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 "fodbold" -#: 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 "svømning" -#: 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 "bordtennis" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Idrætscenter" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Ret idrætscenter" -#: 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 "Golfbane" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Ret golfbane" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Ret minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Multi" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Ret multi" @@ -16807,248 +18301,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 "bane" -#: 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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Ret bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletik" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Ret atletik" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Bueskydning" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Ret bueskydning" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klatring" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Ret klatring" -#: 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 "Cykling" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Redigér cykling" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Hundeløb" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Ret hundeløb" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Ridning" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Ret ridning" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Galopbane" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Ret galopbane" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastik" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Ret gymnastik" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorsport" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Ret motorsport" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skating" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Ret skating" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Ret Skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Svømning" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Ret svømning" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Skisport" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Ret skisport" #. 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 "Sværhedsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "nybegynder" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "let" -#: 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 "avanceret" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "ekspert" -#: 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 "Skydning" @@ -17056,178 +18542,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Ret skydning" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Sport (bold)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fodbold" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Ret fodbold" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Amerikansk fodbold" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Ret amerikansk fodbold" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australsk fodbold" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Ret australsk fodbold" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Ret Baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Ret Basketball" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Ret Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "Golfbane" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Petanque" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Ret petanque" -#: 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 "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Ret cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricketnet" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Ret cricketnet" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Kroket" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Ret kroket" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Ret hockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Ret pelota" -#: 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 "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Ret rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Bordtennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Ret bordtennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Ret tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Bygninger" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bygning" @@ -17235,5 +18721,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Offentlig bygning" @@ -17241,10 +18727,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Ret offentlig bygning" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Rådhus" @@ -17252,10 +18738,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Ret rådhus" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassade" @@ -17263,10 +18749,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Ret ambassade" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Domhus" @@ -17275,10 +18761,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Ret domhus" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Fængsel" @@ -17287,10 +18773,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Ret fængsel" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Politi" @@ -17300,10 +18786,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 "Ret politi" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Brandstation" @@ -17312,10 +18798,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Ret brandstation" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Posthus" @@ -17323,5 +18809,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Ret posthus" @@ -17329,15 +18815,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Børnehave" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Ret børnehave" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Skole" @@ -17345,10 +18831,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Ret skole" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universitet" @@ -17356,10 +18842,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Ret universitet" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "" @@ -17367,5 +18853,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "" @@ -17373,5 +18859,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Biograf" @@ -17380,10 +18866,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Ret biograf" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliotek" @@ -17392,10 +18878,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Ret bibliotek" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Kunstcenter" @@ -17403,10 +18888,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Redigér kunstcenter" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teater" @@ -17415,10 +18900,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Ret teater" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Sted for tilbedelse" @@ -17428,5 +18913,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 "Ret sted for tilbedelse" @@ -17435,6 +18920,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 "Religion" @@ -17443,66 +18928,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 "bahai" -#: 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 "buddhistisk" -#: 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 "kristen" -#: 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 "hinduistisk" -#: 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 "jainistisk" -#: 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 "jødisk" -#: 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 "muslimsk" -#: 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 "sikh" -#: 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 "spiritistisk" -#: 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 "taoistisk" -#: 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 "unitar" -#: 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 "zoroastristisk" -#: 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 "Trosretning" @@ -17511,81 +18996,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 "anglikansk" -#: 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 "baptistisk" -#: 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 "katolsk" -#: 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 "evangelisk" -#: 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 "Jehovas Vidner" -#: 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 "luthersk" -#: 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 "metodistisk" -#: 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 "mormonsk" -#: 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 "ortodoks" -#: 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 "pinsebevægelsen" -#: 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 "prebyteriansk" -#: 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 "protestantisk" -#: 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 "kvæker" -#: 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 "shiitisk" -#: 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 "sunnitisk" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresser" @@ -17594,5 +19079,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Ret adresseinformation" @@ -17600,5 +19085,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Husnummer" @@ -17606,20 +19091,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Husnavn" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Bynavn" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postnummer" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Landekode" @@ -17627,5 +19112,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Adresse-interpolering" @@ -17634,5 +19119,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Ret adresse-interpolering" @@ -17640,71 +19125,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Nummereringssystem" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "ulige" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "lige" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "alle" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Menneskeskabt" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabrik" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Ret fabrik" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Tårn" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Ret tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vandtårn" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Ret vandtårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasbeholder" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Ret gasbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Fyrtårn" @@ -17712,10 +19193,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Ret fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Vejrmølle" @@ -17723,10 +19204,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Ret vejrmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Rørledning" @@ -17734,10 +19215,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Ret rørledning" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Rensningsanlæg" @@ -17747,10 +19228,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 "Ret rensningsanlæg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Kran" @@ -17758,10 +19239,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Ret kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Pejlemærke" @@ -17769,10 +19250,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Ret Pejlemærke" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "" @@ -17780,10 +19261,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 "Overvågning" @@ -17791,5 +19272,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Ret overvågningskamera" @@ -17797,5 +19278,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Generator" @@ -17805,39 +19286,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 "Ret generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vand" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "arom" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kul" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "sol" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Kraftværk" @@ -17846,10 +19327,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Ret kraftværk" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -17858,5 +19339,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Ret transformatorstation" @@ -17864,10 +19345,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 "Elmast" @@ -17878,5 +19359,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 "Ret elmast" @@ -17884,5 +19365,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Strømkabel" @@ -17891,46 +19372,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Ret strømkabel" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Spænding" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Antal kabler" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Faciliteter" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toiletter" -#. 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 "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -17939,5 +19414,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Ret telefon" @@ -17945,5 +19420,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 "Mønter" @@ -17951,5 +19426,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 "Sedler" @@ -17957,5 +19432,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 "" @@ -17963,5 +19438,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 "" @@ -17969,15 +19444,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 "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Genbrug" @@ -17986,5 +19461,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Ret genbrugsplads" @@ -17992,80 +19467,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Dåser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Tøj" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Skrotjern" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Bænk" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Skydetelt" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Ret skydetelt" -#. 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 "Højde" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "lav" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "halv" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "fuld" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Skjul" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Lås" -#. 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 "Højde" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "lav" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "halv" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "fuld" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Springvand" @@ -18074,10 +19545,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Ret springvand" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Vandpost" @@ -18086,10 +19557,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Ret vandpost" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Babyluge" @@ -18097,25 +19568,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Ret babyluge" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarked" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Ret supermarked" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Feriehytte" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Ret feriehytte" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Købmand" @@ -18123,10 +19604,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Ret købmand" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18134,10 +19614,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Ret kiosk" -#. 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 "Ret busstop" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Ret et træ" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Automat" @@ -18145,5 +19644,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Ret automat" @@ -18151,88 +19650,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Varer i automat" #. 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 "P-automat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "mad" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "drikke" -#: 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 "cigaretter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "billeder" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "dyremad" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "legetøj" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "frimærker" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kort" -#: 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 "kondomer" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tamponer" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "høm-høm-pose" #. 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 "Slagter" @@ -18240,10 +19739,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Ret slagter" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Bager" @@ -18251,10 +19749,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Ret bager" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Blomsterhandler" @@ -18262,20 +19759,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Ret blomsterhandler" -#. 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 "Sprit" @@ -18283,60 +19778,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Redigér spritbutik" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Drikkevarer" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Redigér drikkevarebutik" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Ret computerforretning" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronik" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Ret elektronikforretning" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hi-fi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Ret hi-fi-forhandler" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Møbelforretning" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Ret møbelforretning" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Havecenter" @@ -18344,10 +19833,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Redigér havecenter" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "" @@ -18355,10 +19843,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 "Gør-det-selv-butik" @@ -18366,60 +19853,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Ret gør-det-selv-butik" -#. 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 "Frisør" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Ret frisør" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Sko" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Ret skobutik" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Legetøjsbutik" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Redigér legetøjsbutik" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Redigér videobutik" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Kemisk renseri" @@ -18427,10 +19908,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Ret kemisk renseri" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Vaskeri" @@ -18438,10 +19918,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Ret vaskeri" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "" @@ -18449,35 +19928,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 "Sport" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Ret sportsbutik" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Ret optiker" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Penge" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -18485,16 +19961,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Ret bank" -#. 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 "Pengeautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Vekselkontor" @@ -18502,5 +19976,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Ret vekselkontor" @@ -18508,15 +19982,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Ret pengeautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Sundhed" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Lægehus" @@ -18524,20 +19998,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Ret lægehus" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Tandlæge" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Ret tandlæge" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apotek" @@ -18545,5 +20017,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Ret apotek" @@ -18551,10 +20023,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Håndkøb" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Hospital" @@ -18562,10 +20033,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Ret Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "" @@ -18574,5 +20045,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18581,20 +20052,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 "Telefonnummer" #. 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 "(brug forvalgskode, fx +12-345-67890)" @@ -18602,5 +20073,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 "Dyrlæge" @@ -18609,55 +20080,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Ret dyrlæge" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Ret et kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Ret land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Stat" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Ret stat" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Ret region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Amt" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Ret amt" @@ -18665,15 +20136,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "By" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Ret by" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Mindre by" @@ -18681,10 +20152,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Ret mindre by" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Forstad" @@ -18692,25 +20163,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Ret forstad" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "By" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Ret by" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Landsby" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Ret landsby" @@ -18718,5 +20189,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Egn" @@ -18724,10 +20195,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Ret lokalitet" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Ø" @@ -18735,11 +20206,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Ret ø" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "venstre" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Ret feriehytte" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Huleindgang" @@ -18747,10 +20231,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Ret huleindgang" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Tinde" @@ -18758,10 +20242,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Ret tinde" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Gletsjer" @@ -18769,10 +20253,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Ret gletsjer" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkan" @@ -18780,70 +20264,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Ret vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Grænser" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "National" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Ret landegrænser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrativt" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Ret administrativ grænse" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Ret civil-grænse" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politisk" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Ret politisk grænse" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Nationalpark" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Ret grænser for nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Brug af land" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Træ" @@ -18852,15 +20336,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Ret et træ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Skov" @@ -18869,5 +20353,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Ret skov" @@ -18875,17 +20359,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 "Nåleskov" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "Løvskov" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "blandet" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Skov" @@ -18894,14 +20378,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Ret skovområde" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Ret naturreservat" @@ -18909,25 +20393,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Ur" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Ret ur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Krat" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Ret krat" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Højdedrag" @@ -18935,10 +20419,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Ret højdedrag" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Hede" @@ -18946,5 +20430,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Ret hede" @@ -18952,5 +20436,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Gårdsplads" @@ -18959,45 +20443,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Ret gårdsplads" #. 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 "Eng" #. 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 "Vingård" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Ret vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Kolonihaver" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Ret kolonihave-område" @@ -19005,25 +20489,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Have" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Ret have" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Græs" #. 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 "" @@ -19031,10 +20515,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 "" @@ -19042,20 +20526,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 "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Ret park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Rekreativt område" @@ -19063,5 +20547,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Ret rekreativt område" @@ -19069,15 +20553,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Beboelseområde" #. 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 "Kirkegård" @@ -19085,9 +20569,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Ret kirkegård" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Kirkegård" @@ -19095,39 +20579,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Ret kirkegård" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Detailhandel" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Ret område for detailhandel" #. 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 "Industri" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Ret industri-område" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "" @@ -19135,15 +20619,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 "Militært område" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Ret militært område" @@ -19151,55 +20635,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Byggeplads" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Ret område for byggeplads" #. 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 "Stenbrud" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Ret stenbrudsområde" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19209,5 +20693,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 "Ret multipolygon" @@ -19216,10 +20700,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "ydre segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "indre segment" @@ -19227,5 +20711,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19234,5 +20718,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19240,34 +20724,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 "" @@ -19276,15 +20760,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 "" @@ -19292,5 +20776,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Rute" @@ -19299,5 +20783,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Ret rute" @@ -19305,5 +20789,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19375,5 +20859,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 @@ -19382,17 +20866,17 @@ msgstr "cykel" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "vej" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "færge" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19445,5 +20929,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 @@ -19452,13 +20936,13 @@ msgstr "fod" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "vandre" -#: 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 "omvej" @@ -19472,10 +20956,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "undergrundsbane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Symbol beskrivelse" @@ -19483,31 +20967,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Netværk" #. 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 "foreslået" -#: 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 "midlertidig" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Farve (hex)" @@ -19516,30 +21000,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "rute-segment" #. 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 "" @@ -19977,11 +21461,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 "" @@ -20307,41 +21791,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 "gade" #. color street @@ -22042,5 +23489,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 "" @@ -22639,55 +24086,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22701,5 +24099,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 "turisme" @@ -22771,8 +24169,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 "historisk" @@ -22843,8 +24241,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 "" @@ -22858,5 +24256,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "stenbrud" @@ -22870,5 +24268,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22890,5 +24288,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22902,5 +24300,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "skov" @@ -22914,5 +24312,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22935,5 +24333,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22947,5 +24345,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industri" @@ -22959,5 +24357,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22971,5 +24369,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22983,5 +24381,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -23038,7 +24436,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 "militær" @@ -23052,5 +24450,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "kirkegård" @@ -23063,5 +24461,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "" @@ -23076,5 +24474,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "gletsjer" @@ -23088,5 +24486,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulkan" @@ -23141,8 +24539,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 "" @@ -23156,5 +24554,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "buskads" @@ -23168,20 +24566,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "hede" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "træ" - #. color water #. 1 @@ -23192,5 +24578,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "" @@ -23204,5 +24590,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "strand" @@ -23280,8 +24666,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 "" @@ -23329,7 +24715,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 "grænse" @@ -23471,10 +24857,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 "sted" @@ -23522,6 +24917,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 "adresse" @@ -23818,4 +25213,71 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. " +#~ "Rapportér venligst dette som en fejl." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Intet dokument er åbent, så der er intet at gemme." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Slet {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan ikke åbne mappen for indstillinger: {0}" + +#~ msgid "nodes" +#~ msgstr "punkter" + +#~ msgid "ways" +#~ msgstr "veje" + +#~ msgid "relations" +#~ msgstr "relationer" + +#~ msgid "changesets" +#~ msgstr "rettesæt" + +#~ msgid "Delete Layer" +#~ msgstr "Slet lag" + +#~ msgid "Authors: {0}" +#~ msgstr "Forfattere: {0}" + +#~ msgid "Public" +#~ msgstr "Offentlig" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "DETTE ER PÅ FORSØGSBASIS. Gem dit arbejde og bekræft før afsendelse" + +#~ msgid "Continue anyway" +#~ msgstr "Fortsæt alligevel" + +#~ msgid "Edit Information Office" +#~ msgstr "Redigér informationskontor" + +#~ msgid "Map Type" +#~ msgstr "Kort type" + +#~ msgid "map" +#~ msgstr "kort" + +#~ msgid "citymap" +#~ msgstr "bykort" + +#~ msgid "hikingmap" +#~ msgstr "vandrekort" + +#~ msgid "bicyclemap" +#~ msgstr "cykelkort" + #~ msgid "Move" #~ msgstr "Flyt" @@ -23877,7 +25339,4 @@ #~ msgid "Object" #~ msgstr "Objekt" - -#~ msgid "Not implemented yet." -#~ msgstr "Endnu ikke implementeret." #~ msgid "Resolve Conflicts" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 17484) +++ /applications/editors/josm/i18n/po/de.po (revision 17485) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" -"PO-Revision-Date: 2009-08-17 14:17+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-06 11:33+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" @@ -17,21 +17,21 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Hauptfenster erzeugen" #. 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 "Hilfe" -#: ../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" @@ -40,56 +40,59 @@ "benutzt." -#: ../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,155 +102,162 @@ #: ../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 "Fehler" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden." - -#: ../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] "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" +msgstr[1] "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Ungespeicherte Änderungen" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" - -#: ../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 "Speichern und Beenden" -#: ../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 "Verwerfen und Beenden" -#: ../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 "Abbrechen" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{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 "Warnung" -#: ../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 "Ignoriere die ungültige Datei-URL: \"{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 "" +"Die Datei ''{0}'' konnte nicht gelesen werden. Der Fehler lautet:
" +"{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -272,7 +282,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" @@ -310,5 +321,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" @@ -332,6 +343,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 "Plugins" @@ -346,8 +357,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 "" "Achtung: Unbekanntes Format der API-URL. Die Weiterleitung zur OSM-" @@ -355,5 +366,15 @@ "API-URL ist: \"{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 "" +"Achtung: Unbekanntes Format der API-URL. Die Weiterleitung zur OSM-" +"Änderungsseite des Elements könnte fehlschlagen.\r\n" +"API-URL ist: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -361,5 +382,5 @@ "oder Relation) auswählen." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -370,5 +391,5 @@ "angezeigt." -#: ../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 "Bitte die Zielebene auswählen." @@ -378,11 +399,11 @@ msgstr "Zielebene auswählen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Vereinen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -393,5 +414,5 @@ "werden könnte." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Keine Zielebenen" @@ -408,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 @@ -441,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 "Breitengrad" @@ -448,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 "Längengrad" +#: ../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 "Knotenpunkte im Kreis anordnen" -#: ../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 "Gewählte Punkte in einem Kreis anordnen." -#: ../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 @@ -485,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 @@ -492,58 +513,57 @@ msgstr "Werkzeug: {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 "Bitte mindestens vier Knotenpunkte auswählen." #. 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 "Information" #. 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 "Knotenpunkte in einer Linie anordnen" -#: ../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 "Gewählte Punkte so verschieben, dass sie in einer Linie liegen." -#: ../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 "Bitte mindestens drei Knotenpunkte auswählen." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -554,10 +574,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 "Unvereinbarkeit den Fähigkeiten der API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -568,5 +588,5 @@ "abgeschnitten" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -577,9 +597,9 @@ "die maximal erlaubte Länge ({2})." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen" -#: ../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}" @@ -588,37 +608,37 @@ "({2})" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "Daten" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "Ebene" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "Auswahl" -#: ../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 "Konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "heruntergeladene Daten" +#: ../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 "Auf {0} zoomen" -#: ../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 "Ansicht auf {0} zoomen" -#: ../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 @@ -628,22 +648,22 @@ msgstr "Anzeige: {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 "Nichts ausgewählt, auf das gezoomt werden kann." -#: ../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 "Keine Konflikte, auf die gezoomt werden kann." +#: ../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 "Weg verbinden" -#: ../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 "Mehrere Wege zu einem verbinden." -#: ../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 "Bitte wählen Sie mindestens zwei Wege zum Verbinden." @@ -654,4 +674,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Trotzdem verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -661,19 +685,7 @@ "wirklich verbunden werden?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Trotzdem verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Richtungen ändern?" - -#: ../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 "" -"Die Wege können nicht mit ihrer aktuellen Richtungen kombiniert werden. " -"Möchten Sie, dass einige Richtungen gedreht werden?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -681,27 +693,34 @@ msgstr "Drehen und Verbinden" -#: ../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 "" +"Die Wege können nicht mit ihrer aktuellen Richtungen kombiniert werden. " +"Möchten Sie, dass einige Richtungen gedreht werden?" + +#: ../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 "Werte für alle Konflikte festlegen." -#: ../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 "Konflikte auflösen" -#: ../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} Wege verbinden" -#: ../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 "Alle Wege sind leer" -#: ../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 " @@ -711,32 +730,32 @@ "Reihenfolge gebracht werden)" +#: ../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 "Kopie" -#: ../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 "Gewählte Objekte in die Zwischenablage kopieren." -#: ../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 "Bitte etwas zum Kopieren auswählen." +#: ../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 "Kreis erstellen" -#: ../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 "Einen Kreis aus drei ausgewählten Knoten erstellen." -#: ../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 "Diese Knoten sind nicht in einem Kreis angeordnet. Abbruch." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -748,20 +767,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 "Entfernen" @@ -771,85 +790,86 @@ msgstr "Ausgewählte Objekte löschen." -#: ../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 "Überschreiben" -#: ../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 "Datei existiert bereits. Überschreiben?" #. 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 "Knoten verteilen" -#: ../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 "Gewählte Punkte gleichmäßig auf einer Linie verteilen." +#: ../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 "Von OSM-Server herunterladen..." -#: ../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 "Kartendaten vom OSM-Server laden." -#: ../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 "Datei: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Daten herunterladen" -#: ../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 "Bitte wählen Sie mindestens eine Aufgabe zum Herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Verweise von OSM herunterladen..." -#: ../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 "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Verweise herunterladen..." -#: ../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 "Es traten {0} Konflikte während des Imports auf." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Konflikte beim Herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -858,6 +878,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 "Duplizieren" @@ -881,28 +901,33 @@ msgstr "Programm beenden" +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Alle Bilder" + +#: ../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 "Als GPX exportieren..." -#: ../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 "Die Daten ins GPX-Format exportieren." -#: ../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 "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten." -#: ../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 "Parameter ''{0}'' darf nicht null sein" -#: ../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}''." @@ -910,57 +935,58 @@ "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "GPX-Datei exportieren" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM-Onlinehilfe" -#: ../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 "Im Browser öffnen" -#: ../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 "Bearbeiten" -#: ../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 "Neu laden" -#: ../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 "Sie können nur die Hilfeseiten der JOSM-Onlinehilfe bearbeiten." -#: ../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 "Fehler beim Laden der Seite {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." msgstr "Hilfeseite fehlt. In englischer Sprache erstellen." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1014,22 +1040,26 @@ msgstr "Aktuelle Ebene mit einer anderen zusammenführen" +#: ../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 "Knotenpunkte vereinigen" -#: ../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 "Mehrere Knotenpunkte zum ältesten vereinigen." -#: ../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 "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen." -#: ../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 "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Trotzdem vereinen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1039,9 +1069,5 @@ "wirklich vereint werden?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Trotzdem vereinen" - -#: ../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 "" @@ -1049,69 +1075,69 @@ "gelöscht werden." -#: ../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} Knotenpunkte vereinigen" +#: ../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 "Auswahl vereinigen" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Führt die ausgewählte Primitive in eine andere Schicht" +#: ../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 "Spiegeln" -#: ../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 "Gewählte Knotenpunkte und Wege spiegeln." -#: ../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 "Bitte mindestens einen Weg oder Knoten wählen." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "hoch" -#: ../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 "Objekte {0} verschieben" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "runter" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "links" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "rechts" -#: ../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} verschieben" -#: ../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 "Verschiebt Objekte {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 "Kann Objekte nicht nach außerhalb der Welt verschieben." @@ -1119,5 +1145,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 "Neu" @@ -1127,19 +1153,22 @@ msgstr "Eine neue Karte erstellen." -#: ../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 "Öffnen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Datei öffnen." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" -"Die Datei ''{0}'' konnte nicht gelesen werden. Der Fehler lautet:
" -"{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Datei öffnen." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Unbekannte Role \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1177,23 +1206,18 @@ msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Nur zwei Knoten erlaubt" -#: ../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 "Auswahl darf nur aus Wegen bestehen." -#: ../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 "" "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." - -#: ../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 " @@ -1205,9 +1229,9 @@ "Projektion zum Ausschalten dieser Warnung.
Wollen Sie fortfahren?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Nur ein Knoten ausgewählt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Rechtwinklig machen" @@ -1223,13 +1247,26 @@ msgstr "Inhalt der Zwischenablage einfügen." -#: ../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 "Merkmale einfügen" -#: ../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 "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "{0} herunterladen" +msgstr[1] "{0} herunterladen" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "{0} Objekte wiederherstellen" +msgstr[1] "{0} Objekte wiederherstellen" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1255,39 +1292,32 @@ msgstr "Letzte Änderung wiederherstellen." -#: ../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 "Ebene umbennen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Die Datei auch umbenennen" -#: ../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 "" -"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -"Fehlermeldung ist: {0}" - -#: ../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 "Die Datei ''{0}'' konnte nicht umbenannt werden" +#: ../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 "Richtung der Wege drehen" -#: ../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 "Die Richtung aller gewählter Wege umdrehen." -#: ../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 "Bitte mindestens einen Weg wählen." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Richtung des Weges drehen" @@ -1295,10 +1325,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 "Speichern" #: ../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 "Aktuelle Daten speichern." @@ -1309,37 +1340,25 @@ msgstr "Datei {0} existiert bereits. Überschreiben?" -#: ../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 "Keine Exportfunktion gefunden! Es wurde nichts gespeichert." -#: ../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 "" -"Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions for " -"no layer.\"" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Leeres Dokument" -#: ../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 "Das Dokument enthält keine Daten." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Trotzdem speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikte" -#: ../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 " @@ -1349,28 +1368,28 @@ "Sollen alle Konflikte abgewiesen werden?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Konflikte abweisen und speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "OSM-Datei speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "GPX-Datei speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Ebene speichern" +#: ../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 "Speichern unter..." -#: ../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 "Aktuelle Daten in einer neuen Datei speichern." @@ -1404,33 +1423,33 @@ msgstr "Hilfe: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Statusbericht" -#: ../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 "In die Zwischenablage kopieren und schließen" -#: ../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 "Schließen" +#: ../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 "Weg aufspalten" -#: ../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 "Weg am gewählten Knotenpunkt aufspalten." -#: ../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 "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden." -#: ../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." @@ -1438,5 +1457,5 @@ msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges." -#: ../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 " @@ -1452,9 +1471,9 @@ "Bitte auch den Weg auswählen." -#: ../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 "Die gewählten Punkte gehören nicht zum selben Weg." -#: ../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." @@ -1462,6 +1481,6 @@ msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte." -#: ../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 "" @@ -1469,5 +1488,5 @@ "trennen zu können." -#: ../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 " @@ -1477,5 +1496,5 @@ "in der Mitte des Weges.)" -#: ../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 " @@ -1485,5 +1504,5 @@ "kopiert.
Sie sollten dies überprüfen und falls nötig korrigieren." -#: ../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 " @@ -1493,8 +1512,34 @@ "sollten dies überprüfen und falls nötig korrigieren." -#: ../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 "Weg {0} in {1} Teile teilen" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Schließe Änderungssatz..." + +#: ../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 "Schließe Änderungssatz..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "Es existieren momentan keine justierbaren WMS-Ebenen" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Öffne Änderungssatz..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Schließe Änderungssatz..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1512,42 +1557,42 @@ msgstr "Globale Einstellung \"{0}\" umschalten." +#: ../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 "Wege trennen" -#: ../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 "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden." -#: ../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 "Dieser Knoten ist mit nichts verbunden." -#: ../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 "Keiner dieser Knoten ist mit anderen Elementen verbunden." -#: ../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 "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden." -#: ../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 "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Bitte wählen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Ein Knoten mit Merkmalen, oder" -#: ../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 "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "" @@ -1555,5 +1600,5 @@ "oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1562,5 +1607,5 @@ "verwendet werden, oder" -#: ../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." @@ -1569,5 +1614,5 @@ "werden." -#: ../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" @@ -1581,9 +1626,9 @@ "und alle Knoten werden ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Knotenpunkte getrennt" -#: ../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" @@ -1591,5 +1636,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" @@ -1634,61 +1679,71 @@ "Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" -#: ../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 "Daten aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "Aktueller Datensatz wurde nicht gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Auswahl aktualisieren" -#: ../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 "Aktualisiert die ausgewählten Objekt vom Server" -#: ../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 "Es sind keine Objekte zum Aktualisieren ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Auswahl leer" -#: ../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 "Zum OSM-Server hochladen..." -#: ../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 "Alle Änderungen zum OSM-Server hochladen." -#: ../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 "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nichts geändert. Erfassen Sie erst einige Daten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Keine Änderungen zum Hochladen vorhanden." -#: ../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 "Nur {0} {1} synchronisieren" -#: ../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 "Ganzen Datensatz synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1711,17 +1766,17 @@ "weiterzuarbeiten." -#: ../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 "Konflikt festgestellt" #. 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 "Unerwarteter Rückgabewert: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1737,10 +1792,10 @@ "weiterzuarbeiten." -#: ../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}\"" msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\"" -#: ../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}\"" @@ -1748,22 +1803,60 @@ "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{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 "Hochladen fehlgeschlagen.
{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 "Hochladen zu OSM-API fehlgeschlagen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Objekt aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Diese Änderungen hochladen?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Änderungen hochladen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Ändere neue Relation in Ebene \"{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 "Einen Knotenpunkt in einen bestehenden Weg einfügen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "Alle Änderungen mit einer Anfrage hochladen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1773,31 +1866,80 @@ "Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." -#: ../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 "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Karten-Einstellungen" + +#: ../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 "Änderungssatz" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Neue Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Geänderte Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Zu löschende Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Diese Änderungen hochladen?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Änderungen hochladen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Hochladen" +#: ../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] "Neue Objekte:" +msgstr[1] "Neue Objekte:" + +#: ../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] "Geänderte Objekte:" +msgstr[1] "Geänderte Objekte:" + +#: ../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] "Zu löschende Objekte:" +msgstr[1] "Zu löschende Objekte:" + +#: ../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 "Letzte Änderung am {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1821,20 +1963,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 "Audio: {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 "Schneller" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Schneller abspielen" @@ -1876,10 +2018,10 @@ msgstr "Die vorherige Marke abspielen." -#: ../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 "Langsamer" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Langsamer abspielen" @@ -1909,22 +2051,18 @@ "Fehlermeldung war: {0}" -#: ../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 "Keine Daten importiert." -#: ../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-Daten" -#: ../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} von {1} herunterladen (noch {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Daten aktualisieren" - -#: ../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}" @@ -1933,9 +2071,9 @@ "aufgetreten:{0}" -#: ../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 "Fehler beim Herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1953,20 +2091,20 @@ "ignorieren
" -#: ../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 "Gelöschte oder verschobene Objekte" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Löschmodus" -#: ../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 "Knotenpunkte oder Wege löschen." -#: ../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 @@ -1975,5 +2113,5 @@ msgstr "Modus: {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 " @@ -1983,55 +2121,69 @@ "Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte." -#: ../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 "Parameter \"{0}\" darf nicht NULL sein" +#: ../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 "Zeichnen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Knotenpunkt setzen" -#: ../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 "Modus: Zeichnen (Fokus)" -#: ../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 @@ -2039,38 +2191,38 @@ msgstr "Ausgewählt" -#: ../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 "Kann keinen Knoten außerhalb der Welt erstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Knotenpunkt hinzufügen" -#: ../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 "Knotenpunkt in einen Weg einfügen" -#: ../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 "Existierenden Weg mit Knotenpunkt verbinden" -#: ../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 "Einen Knotenpunkt in einen bestehenden Weg einfügen" -#: ../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 "Knotenpunkt in einen Weg einfügen und verbinden" -#: ../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 "Einen neuen Knoten erstellen." -#: ../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 "Knoten unter Mauszeiger wählen." -#: ../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." @@ -2079,14 +2231,14 @@ msgstr[1] "Neuen Knoten in {0} Wege einfügen." -#: ../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 "Neuen Weg an letztem Knoten beginnen." -#: ../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 "Weg am letzten Knoten fortsetzen." -#: ../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 "Zeichnen beenden." @@ -2106,5 +2258,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 "Maustaste loslassen, um Objekte im Rechteck auszuwählen." @@ -2116,5 +2268,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 "Maustaste loslassen, um das Drehen zu stoppen." @@ -2132,17 +2284,18 @@ "Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt." +#: ../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 "Auswahl" -#: ../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 "Objekte auswählen, verschieben, und drehen" -#: ../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" @@ -2151,13 +2304,21 @@ msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Elemente verschieben" -#: ../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 "Verschieben" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Verschieben rückgängig machen" + +#: ../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 "" @@ -2166,13 +2327,9 @@ "Wollen Sie sie wirklich verschieben?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Verschieben" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Verschieben rückgängig machen" - -#: ../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." @@ -2181,5 +2338,5 @@ "Punkt vereinigen." -#: ../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-" @@ -2206,44 +2363,44 @@ "runter, rechts; Zoom verschieben mit rechter Maus" +#: ../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 "Suchen..." -#: ../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 "Nach Objekten suchen." -#: ../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 "Es kann nicht gesucht werden, da keine Daten geladen sind." -#: ../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 "Bitte einen Suchbegriff eingeben." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "Auswahl ersetzen" -#: ../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 "zur Auswahl hinzufügen" -#: ../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 "aus der Auswahl entfernen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "Groß-/Kleinschreibung beachten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "Regulärer Ausdruck" -#: ../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 "" @@ -2251,18 +2408,18 @@ "Namen." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Berliner Straße\" - 'Berliner Straße' in einem Schlüssel oder Namen." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Berliner Straße\" - 'Berliner Straße' in einem Schlüssel oder Namen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Ber - 'Ber' irgendwo im Namen." -#: ../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 - Schlüssel 'type' mit exakt dem Wert '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, " @@ -2272,51 +2429,52 @@ "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:Ber - kein 'Ber' im Namen." -#: ../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: - Schlüssel=foot mit beliebigem Wert." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Spezialsuchen:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - Typ des Objektes (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - Typ des Objektes (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - Alle von diesem Nutzer geänderten Objekte" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - Objekt mit gegebener ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - Objekt mit gegebener ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - Objekte mit gegebener Knotenanzahl" -#: ../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 - Alle geänderten Objekte" -#: ../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 - Alle ausgewählten Objekte" -#: ../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 - Alle unvollständigen Objekte" -#: ../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 "untagged - Alle Objekte ohne Merkmale" -#: ../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" @@ -2325,5 +2483,5 @@ "Ausdrucks" -#: ../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" @@ -2332,56 +2490,56 @@ "Ausdrucks" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "Use | or OR to combine with logical or" +msgstr "" +"Nutzung von | oder OR zum Kombinieren mittels logischem Oder." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Nutzung von | oder OR zum Kombinieren mittels logischem Oder." +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Nutzung von \" zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Nutzung von \" zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "Nutzung von ( und ) zum Gruppieren von Ausdrücken." -#: ../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 "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Suche starten" -#: ../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 "Nichts gefunden für Suche ''{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 "Nichts zur Auswahl hinzugefügt durch Suche nach ''{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 "Nichts aus der Auswahl entfernt durch Suche ''{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} Treffer gefunden" -#: ../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" @@ -2450,58 +2608,96 @@ msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Auswahl laden" -#: ../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 "Verbinden zu {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Daten werden geladen..." -#: ../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 "Konnte nicht von der URL \"{0}\" lesen" -#: ../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 "URL \"{0}\" kann nicht interpretiert werden." -#: ../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 "Bei der Verbindung zum Server \"{0}\" ist ein Fehler aufgetreten." -#: ../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 "Knotenpunkt hinzufügen" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "{0} {1} hinzufügen" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "{0} {1} ändern" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relationen: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Änderungssatz {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Änderungssatz {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Relation ändern" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "\"{0}\" entfernen für {1} \"{2}\"" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "\"{0}\" entfernen für {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}\" entfernen für {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "{0}={1} setzen für {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} setzen für {2} \"{3}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "{0}={1} setzen für {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" @@ -2510,10 +2706,10 @@ msgstr[1] "Objekte" -#: ../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}\" entfernen für {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}" @@ -2525,5 +2721,5 @@ msgstr "Ändere Role des Relationselements {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2534,10 +2730,10 @@ "
Dieser Konflikt kann nicht hinzugefügt werden." -#: ../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 "Doppelter Konflikt" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2548,5 +2744,5 @@ "\"{1}\" nicht entfernen" -#: ../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}''" @@ -2572,44 +2768,60 @@ msgstr "Kann unentschiedenen Konflikt nicht auflösen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "{1} {0} löschen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "{0} {1} löschen" - -#: ../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} löschen" +msgstr[1] "{0} {1} löschen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Löschmodus" +msgstr[1] "Löschmodus" + +#: ../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} löschen" +msgstr[1] "{0} {1} löschen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Aus der Relation entfernen" +msgstr[1] "Aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Konflikt mit Relation" -#: ../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 "Aus der Relation entfernen" + +#: ../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 "" "Auswahl \"{0}\" wird mit Rolle {2} in Relation \"{1}\" verwendet.\n" "Aus Relation entfernen?" -#: ../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 "Aus der Relation entfernen" - -#: ../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 "" "Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n" "Aus Relation entfernen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Wegabschnitt aufspalten" @@ -2617,6 +2829,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." @@ -2628,5 +2840,5 @@ "diese verwenden.
Wollen Sie die Knoten wirklich löschen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Löschbestätigung" @@ -2637,5 +2849,5 @@ msgstr "Konflikte im Löschstatus für {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2672,10 +2884,20 @@ msgstr "Konflikte in der Elementenliste für Relation {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Relationselement {0} {1} entfernen" - -#: ../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" @@ -2688,17 +2910,37 @@ msgstr "Abfolge" -#: ../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} Merkmalskonflikte für {1} {2} auflösen" -#: ../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} Merkmalskonflikte für {1} {2} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "{0} Merkmalskonflikte für {1} {2} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "{0} Objekte wiederherstellen" -#: ../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 "Versionskonflikt für {0} {1} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Versionskonflikt für {0} {1} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Versionskonflikt für {0} {1} auflösen" @@ -2725,13 +2967,13 @@ "Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relation" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Alter Rolle" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Neue Rolle" @@ -2750,62 +2992,121 @@ #: ../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 "Neuer Wert" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Ausgewählte Änderungen anwenden" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Änderungen nicht anbringen" -#: ../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 "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Eigenschaften von " -#: ../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 "Rollen in Relationen beziehen sich auf" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Automatische Merkmalskorrektur" -#: ../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 "Ungültige Einstellungen in den Zeilen {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kann Einstellungsverzeichnis nicht laden: {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 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" +"Fehler beim Setzen der Referenz. Referenz-ID {0} stimmt nicht mit der ID " +"'{1}' der Geschichte überein" + +#: ../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 "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {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 "Einstellungen auf {0} gespeichert" -#: ../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 "Kann keine Einstellungen zum Server laden. Grund: {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 "Kann keine Einstellungen vom Server laden." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2821,29 +3122,36 @@ msgstr "Konflikt mit Element \"{0}\" besteht bereits" -#: ../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 "Dezimalgrad" -#: ../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 "Grad Minuten Sekunden" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "W" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "O" -#: ../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}" @@ -2855,15 +3163,237 @@ msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{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 "unvollständig" - -#: ../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 "Fehler: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Warnung: {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 "" +"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-" +"Name." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" +"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse." + +#: ../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 "Es gibt kein Objekt mit der Version \"{0}\" in der Objekt-Geschichte." + +#: ../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 "Es wurde kein Objekt in der Geschichte für das Datum {0} gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" +"Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "Keine \"älteste\" Version gefunden. Es gibt gar keine Geschichte." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "Keine \"neueste\" Version gefunden. Es gibt gar keine Geschichte." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden" + +#: ../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 "Konnte kein Objekt mit ID {0} und Version {1} im Datensatz finden" + +#: ../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 "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{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 "" +"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" " +"verglichen werden" + +#: ../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 "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Flächenförmiger Weg ist nicht geschlossen." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen." + +#. 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 "Leeres Element in der Relation." + +#: ../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 "Gelöschtes Element ''{0}'' in der Relation." + +#: ../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 "Weg ''{0}'' mit weniger als zwei Knoten." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Mehr als ein Weg mit \"from\" gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Mehr als ein Weg mit \"to\" gefunden." + +#: ../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 "Mehr als ein Element mit \"via\" gefunden." + +#: ../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 "Unbekannte Role \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Unbekannter Elementtyp für \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Kein \"from\"-Weg gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Kein \"to\"-Weg gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Kein \"via\"-Knoten oder Weg gefunden." + +#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." + +#: ../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 "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." + +#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." + +#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Nicht-Weg ''{0}'' im Multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Kein äußerer Weg im Multipolygon ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Innerer Weg \"{0}\" ist außerhalb." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "Ohne Merkmale" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "Text" + +#. 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 "" +"Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es in " +"der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "Inaktiv" + #: ../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" @@ -2872,22 +3402,7 @@ msgstr[1] "Knotenpunkte" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Fehler: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Warnung: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "Knotenpunkte" - -#: ../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" @@ -2896,12 +3411,7 @@ msgstr[1] "Wege" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "Wege" - -#: ../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" @@ -2910,254 +3420,4 @@ msgstr[1] "Relationen" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "Relationen" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "Änderungssatz" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "Änderungsätze" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "" -"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-" -"Name." - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" -"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse." - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} Element" -msgstr[1] "{0} Elemente" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "Straße" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "Eisenbahn" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "Gewässer" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "Landfläche" - -#: ../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} Knoten" -msgstr[1] "{0} Knoten" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Es gibt kein Objekt mit der Version \"{0}\" in der Objekt-Geschichte." - -#: ../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 "Es wurde kein Objekt in der Geschichte für das Datum {0} gefunden." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" -"Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "Keine \"älteste\" Version gefunden. Es gibt gar keine Geschichte." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "Keine \"neueste\" Version gefunden. Es gibt gar keine Geschichte." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden" - -#: ../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 "Konnte kein Objekt mit ID {0} und Version {1} im Datensatz finden" - -#: ../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 "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{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 "" -"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" " -"verglichen werden" - -#: ../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 "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Flächenförmiger Weg ist nicht geschlossen." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen." - -#. 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 "Leeres Element in der Relation." - -#: ../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 "Gelöschtes Element ''{0}'' in der Relation." - -#: ../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 "Weg ''{0}'' mit weniger als zwei Knoten." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Mehr als ein Weg mit \"from\" gefunden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Mehr als ein Weg mit \"to\" gefunden." - -#: ../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 "Mehr als ein Element mit \"via\" gefunden." - -#: ../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 "Unbekannte Role \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Unbekannter Elementtyp für \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Kein \"from\"-Weg gefunden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Kein \"to\"-Weg gefunden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Kein \"via\"-Knoten oder Weg gefunden." - -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." - -#: ../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 "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." - -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." - -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Nicht-Weg ''{0}'' im Multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Kein äußerer Weg im Multipolygon ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Innerer Weg \"{0}\" ist außerhalb." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "Ohne Merkmale" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "Text" - -#. 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 "" -"Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es in " -"der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "Inaktiv" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3170,5 +3430,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "Hintergrund" @@ -3178,5 +3438,5 @@ msgstr "Hervorgehoben" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "WGS84 Geografisch" @@ -3186,5 +3446,5 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3200,21 +3460,21 @@ "die Daten und starten Sie eine neue Ebene mit der neuen Zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert-Zone (Frankreich)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert-Zone (Estland)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Merkator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Swissgrid (Schweiz)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3234,9 +3494,9 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, java-format -msgid "Could not read bookmarks.
{0}" +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "Die Lesezeichen konnten nicht gelesen werden.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3244,17 +3504,103 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Nicht noch einmal zeigen" -#: ../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/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 "unvollständig" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "Straße" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "Eisenbahn" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "Gewässer" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "Landfläche" + +#: ../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} Knoten" +msgstr[1] "{0} Knoten" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} Element" +msgstr[1] "{0} Elemente" + +#: ../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 "" "Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n" "Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung." -#: ../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 "unbekannt" + +#: ../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 "" @@ -3267,36 +3613,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Vorbedingung nicht erfüllt" -#: ../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 "unbekannt" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3309,9 +3628,9 @@ "Applet
nicht von ''{1}'' geladen." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "Sicherheitsausnahme" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3322,9 +3641,9 @@ "fehlgeschlagen.
Bitte prüfen Sie die Internetverbindung." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "Netzwerkausnahme" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3335,9 +3654,20 @@ "Herunterladen.
Details: {1}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 msgid "IO Exception" msgstr "Ein-/Ausgabefehler" -#: ../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 "" @@ -3351,9 +3681,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Rechner unbekannt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3366,14 +3696,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 "Objekt bereits gelöscht" - -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 -#, java-format -msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" -msgstr "" -"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -"Fehlermeldung ist: {0}" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3390,38 +3713,38 @@ msgstr "Nachricht des Tages herunterladen" -#: ../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 "Einstellungen hochladen" -#: ../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 "Aktuelle Einstellungen auf dem OSM-Server speichern" -#: ../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 "Zeichenkette" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Name des Benutzers." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM-Passwort." -#: ../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 "Appletgröße auf die angegebenen Werte ändern (Format: BREITExHÖHE)" -#: ../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 "Zeichenkette;Zeichenkette;..." -#: ../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 " @@ -3431,5 +3754,5 @@ "oder ein Dateiname sein." -#: ../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 " @@ -3439,5 +3762,5 @@ "lat=y&llon=x&zoom=z oder ein Dateiname sein." -#: ../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 " @@ -3447,9 +3770,9 @@ "Suchanfrage oder eine URL auf ein osm-xml-Dokument sein." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "jeder" -#: ../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 "" @@ -3457,67 +3780,86 @@ "verarbeiten." -#: ../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 "Benutzername" -#: ../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 "Passwort" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "Verwendung" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "Optionen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Diese Hilfe anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standard Unix Geometrie Argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Bounding Box herunterladen" -#: ../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 "Herunterladen der Position aus der URL (mit 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 "Datei öffnen (als Roh-GPS, wenn .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 "Bounding Box als GPS-Spuren herunterladen" -#: ../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 "Mit der angegebenen Suche auswählen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Mit maximiertem Fenster starten" -#: ../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 "Die Einstellungen auf Standardwerte zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Die Sprache festlegen." -#: ../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 "Beispiele" -#: ../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" @@ -3528,47 +3870,47 @@ "--selection verwendet wird." -#: ../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 "Anstatt --download= ist auch osm:// möglich\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Aktualisierte Plugins aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Zeitige Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Voreinstellungen setzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Plugins laden" -#: ../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." msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Datei" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Werkzeuge" -#: ../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 "Vorlagen" -#: ../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 @@ -3580,21 +3922,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 "Drahtdarstellung" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Drahtdarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Vollbild" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Vollbilddarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3634,63 +3976,45 @@ msgstr "Herauszoomen" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "Skala" -#: ../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 "Die geographische Länge an der Mausposition." -#: ../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 "Der Name des Objekts unter der Mausposition." -#: ../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 "Die geographische Breite an der Mausposition." -#: ../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 "Der Winkel zwischen vorherigem und aktuellem Wegabschnitt." -#: ../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 "Die (Kompass-)Richtung des zu zeichnenden Wegabschnittes." -#: ../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 "Die Länge des neu zu zeichnenden Wegabschnittes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(kein Objekt)" -#: ../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 "Ebene nicht in der Liste." -#: ../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 "Ebene ''{0}'' muss in der Liste der Ebenen sein" - -#: ../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 "" -"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -"Fehlermeldung ist: {0}" - -#: ../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 "" -"Warnung: \"Bitte-Warten\"-Dialog konnte nicht in den Vordergrund gebracht " -"werden. Fehlermeldung ist: {0}" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 @@ -3701,10 +4025,4 @@ msgid "File not found" msgstr "Datei nicht gefunden" - -#: ../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 @@ -3765,7 +4083,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" @@ -3781,5 +4098,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" @@ -3886,5 +4203,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 "Meine Version" @@ -3895,5 +4212,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" @@ -3909,5 +4226,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 "Deren Version" @@ -3995,6 +4312,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" @@ -4110,10 +4427,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 "Unerwarteter Spaltenindex ({0})" -#: ../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 "" @@ -4123,19 +4440,19 @@ "Fehler bei der Kommunikation mit dem Server
Details: {0}" -#: ../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 "Fehler bei der Kommunikation mit dem Server" -#: ../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 "Ja, auch wiederherstellen" -#: ../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 "Nein, Operation abbrechen" -#: ../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 "" @@ -4147,5 +4464,5 @@ "wiederhergestellt werden?" -#: ../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 "Zusätzliche Knoten wiederherstellen?" @@ -4166,9 +4483,9 @@ msgstr "Abhängige Objekte wiederherstellen?" -#: ../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 "Eigenschaften in meinem Datensatz (lokaler Datensatz)" -#: ../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 " @@ -4178,95 +4495,97 @@ "eigenen Elements ersetzen, wenn die Vereinigung angewendet wird." -#: ../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 "Eigenschaften in deren Datensatz (Serverdatensatz)" -#: ../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 "Koordinaten:" -#: ../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 "Löschstatus:" -#: ../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 "Löschstatus:" -#: ../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 "(nichts)" -#: ../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 "gelöscht" -#: ../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 "nicht gelöscht" -#: ../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 "Sichtbar (auf Server)" -#: ../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 "nicht sichtbar (auf dem Server)" -#: ../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 "Exakte Kopie der lokalen Version behalten" -#: ../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 "Aus dem lokalen Datensatz löschen" -#: ../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 "Behalte meine Koordinaten" -#: ../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 "Behalte Server-Koordinaten" -#: ../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 "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." -#: ../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 "Behalte den Löchstatus der lokalen Daten." -#: ../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 "Behalte den Löchstatus der Server-Daten." -#: ../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 "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." -#: ../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 "Übernehme meinen Löschstatus" -#: ../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 "Ja, diese ID zurücksetzten" -#: ../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 "Nein, abbrechen" -#: ../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 "" "Um die lokale Version zu erhalten muss JOSM die ID von {0} {1} auf " @@ -4274,17 +4593,17 @@ "neue ID zuteilen.
Sind Sie hiermit einverstanden?" -#: ../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 "ID auf 0 zurücksetzen" -#: ../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 "Übernehme deren Löschstatus" -#: ../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 "Ja, Entfernen" -#: ../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 "" @@ -4295,21 +4614,21 @@ "damit einverstanden?" -#: ../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 "Aus dem Datensatz löschen" -#: ../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 "Löschstatus ist unterschiedlich." #: ../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 "Rolle" #: ../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 "Objekt" @@ -4350,10 +4669,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 @@ -4362,10 +4682,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 @@ -4379,5 +4700,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}" @@ -4418,4 +4739,143 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Server-Daten beinhalten keine Merkmale mit dem Schlüssel {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 "Kein" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "alle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Farbe auswählen" + +#: ../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 "" +"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-" +"Name." + +#: ../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 "Parameter \"{0}\" darf nicht NULL sein" + +#: ../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 "" +"Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{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 "nicht gelöscht" + +#: ../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 +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 "Von Weg" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikte in den Daten" + +#: ../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} Weg" +msgstr[1] "{0} Wege" + +#: ../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} Relation" +msgstr[1] "{0} Relationen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Konfliktlösung" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Konflikte auflösen" + +#: ../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 "Übernehmen" + +#: ../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 "Einfügen" + +#: ../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} Anfang" +msgstr[1] "{0} Anfang" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4431,10 +4891,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 @@ -4442,5 +4902,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}" @@ -4471,5 +4931,5 @@ #: ../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." @@ -4478,33 +4938,25 @@ "Objekte setzen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 -msgid "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" -msgstr "" -"Warnung: Dialog für das Auflösen von Konflikten konnte nicht in den " -"Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#: ../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 "Konfliktauflösung abbrechen und Fenster schließen" -#: ../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 "Gelöste Konflikte anwenden und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Lösung anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "Trotzdem schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Weiter auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4522,65 +4974,68 @@ "Konfliktlösung zurückzukehren." -#: ../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 "Konflikt konnte nicht vollständig gelöst werden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Konflikte auflösen" -#: ../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 "Konflikte lösen für ''{0}''" -#: ../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 "Verlauf" -#: ../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 "Versionen aller gewählten Objekte anzeigen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Das Laden der Historie vom Server ist fehlgeschlagen. Details:
{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 "Tabellenindex außerhalb der Grenzen ({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 "Knoten {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 "Ebene: {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 "Relationen: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "History-Eintrag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "History laden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Lade Historie für {0} mit 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 "Alle ausgewählten Objekte neu laden und die Liste aktualisieren." #. 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 "Anzeigen" -#: ../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 "History der markierten Elemente anzeigen" -#: ../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 "" @@ -4588,89 +5043,51 @@ "auf." -#: ../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 "Ebenen" -#: ../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 "Liste aller geladenen Ebenen öffnen." -#: ../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 "Ausgewählte Ebene löschen." -#: ../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 "" -"In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem löschen?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -msgid "Delete Layer" -msgstr "Ebene löschen" - -#: ../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 "Wollen Sie die Ebene ''{0}'' wirklich löschen?" - -#: ../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 "Bestätigung" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "Ja" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "Nein" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Alle löschen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "Lösche Ebene {0} von {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Anzeigen/Ausblenden" -#: ../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 "Sichtbarkeit der Ebene umschalten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "Aktivieren" -#: ../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 "Die ausgewählte Ebene aktivieren" -#: ../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 "Aktuelle Eben mit einer anderen Ebene verbinden" -#: ../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 "Gewählte Ebene eine Zeile nach oben verschieben" -#: ../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 "Gewählte Ebene eine Zeile nach unten verschieben." -#: ../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 "Ebeneninformation" -#: ../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." @@ -4679,30 +5096,22 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../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 "Ein leerer Wert löscht den Schlüssel." -#: ../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 "Werte ändern?" -#: ../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 "" -"Warnung: Dialog für das Editieren von Eigenschaften konnte nicht in den " -"Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#: ../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" @@ -4711,91 +5120,84 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte" -#: ../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 "Bitte wählen Sie einen Schlüssel" -#: ../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 "Bitte wählen Sie einen Wert" -#: ../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 "" -"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -"Fehlermeldung ist: {0}" - -#: ../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 "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen." -#: ../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 "Eigenschaften/Mitgliedschaften" -#: ../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 "Eigenschaften der ausgewählten Objekte." #. 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 "Element von" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../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 "Hinzufügen" -#: ../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 "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Eigenschaften bearbeiten" -#: ../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 "Den Wert des Schlüssels für alle Objekte bearbeiten" -#: ../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 "Eigenschaften: {0} / Mitgliedschaften: {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 "Eigenschaften / Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Relation ändern" -#: ../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 "Auswahl wirklich aus Relation {0} entfernen?" -#: ../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 "Den gewählten Schlüssel von allen Objekten entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Eigenschaften entfernen" @@ -4804,34 +5206,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 "Relationen" -#: ../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 "Eine Liste aller Relationen öffnen." -#: ../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 "Relationen: {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 "Editor für die gewählte Relation öffnen" -#: ../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 "Gewählte Relation löschen" -#: ../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 "Eine neue Relation erstellen" -#: ../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 "" @@ -4866,23 +5268,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 "Auswahl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} Weg" -msgstr[1] "{0} Wege" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} Relation" -msgstr[1] "{0} Relationen" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4890,16 +5278,9 @@ msgstr "Auswahl: {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 "Ansicht separat darstellen" -#: ../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 "" -"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -"Fehlermeldung ist: {0}" - -#: ../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." @@ -4908,15 +5289,15 @@ "Werkzeugleiste." -#: ../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 "Klicken Sie zum Minimieren oder Maximieren der Ansicht" -#: ../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 "Autoren" -#: ../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 "" @@ -4924,50 +5305,86 @@ "haben." -#: ../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] "Autor" +msgstr[1] "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +#, fuzzy +msgid "Select primitives submitted by this user" +msgstr "Objekte für gewählte Relationselemente auswählen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Anzeigen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Mehr Informationen zu dieser Vorlage" + +#: ../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 "" +"Achtung: Nur die ersten {0} von {1} markierten Elementen werden im Browser " +"angezeigt." + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autoren: {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 "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" -#: ../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 "Alle Child-Verknüpfungen herunterladen (rekursiv)" -#: ../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 "Alle Child-Verknüpfungen herunter laden" -#: ../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 "Ausgewählte Verknüpfungen herunter laden" -#: ../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 "Ausgewählte Child-Verknüpfungen herunter laden" -#: ../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 "Relationselemente herunterladen" -#: ../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 "Konflikte in den Daten" -#: ../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 "" @@ -4978,18 +5395,18 @@ "nicht geladen werden." -#: ../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 "Relation gelöscht" -#: ../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 "Relation {0} wird heruntergeladen" -#: ../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}" @@ -4997,31 +5414,23 @@ "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" -#: ../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 "Merkmale und Elemente" -#: ../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 "Relationen der Eltern" -#: ../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 "Child-Verknüpfungen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 -#, java-format -msgid "" -"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" -msgstr "" -"Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die " -"Ausnahme war: {0}" - #. --- 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 "Rolle:" -#: ../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 " @@ -5033,14 +5442,14 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../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 "Objekt entfernen und Verbindung lösen" -#: ../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 "Ignorieren und die aktuelle Verbindung belassen" -#: ../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 "" @@ -5053,9 +5462,9 @@ "aufnehmen?" -#: ../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 "Mehrere Elemente verweisen auf das gleiche Primitiv" -#: ../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 "" @@ -5068,5 +5477,5 @@ "Relation ''{0}''." -#: ../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" @@ -5075,5 +5484,5 @@ "hinzufügen" -#: ../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" @@ -5082,5 +5491,5 @@ "hinzufügen" -#: ../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 " @@ -5090,5 +5499,5 @@ "ausgewählten Element hinzufügen" -#: ../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 " @@ -5098,5 +5507,5 @@ "ausgewählten Element hinzufügen" -#: ../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 "" @@ -5105,10 +5514,10 @@ #. 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 "Relations-Editor: Ausgewählte entfernen" -#: ../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" @@ -5116,5 +5525,5 @@ "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen" -#: ../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 "" @@ -5125,57 +5534,57 @@ "Auswahl vorkommen" -#: ../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 "Objekte für gewählte Relationselemente auswählen" -#: ../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 "Relationselemente sortieren" #. 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 "Relations-Editor: Sortieren" -#: ../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 "Ausgewählte Elemente nach oben schieben" #. 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 "Relations-Editor: Nach oben verschieben" -#: ../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 "Ausgewählte Elemente nach unten schieben" #. 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 "Relations-Editor: Nach unten verschieben" -#: ../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 "Das aktuell ausgewählte Element aus dieser Beziehung entfernen" #. 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 "Relations-Editor: Entfernen" -#: ../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 "Die aktuell bearbeitete Beziehung löschen" -#: ../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 "Konflikt erstellen und schließen" -#: ../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 "Bearbeitung fortsetzen" -#: ../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 " @@ -5187,9 +5596,9 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../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 "Datenkonflikt" -#: ../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 "" @@ -5200,20 +5609,16 @@ "
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../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 "Aktualisierung übernehmen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "Übernehmen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Updates anwenden und den Dialog schliessen" -#: ../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 @@ -5223,37 +5628,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 "Updates abbrechen und den Dialog schliessen" -#: ../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 "Einen leeren Schlüssel hinzufügen" -#: ../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 "Die ausgewählten Merkmale löschen" -#: ../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 "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." -#: ../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 "Elemente herunterladen" -#: ../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 "Relations-Editor: Elemente herunterladen" -#: ../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 "Definiert eine Rolle für die ausgewählten Elemente" -#: ../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 "Rolle anwenden" -#: ../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 "" @@ -5266,27 +5671,27 @@ "" -#: ../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 "Übernehmen" -#: ../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 "Nicht übernehmen" -#: ../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 "Leere Rolle bestätigen" -#: ../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 "Zoomen auf" -#: ../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 "" "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist" -#: ../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 "" @@ -5294,5 +5699,5 @@ "ist" -#: ../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 "Zoom ist deaktiviert, weil kein Element ausgewählt wurde" @@ -5306,22 +5711,27 @@ msgstr "Verknüpft" -#: ../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 "Verweisende Relationen herunterladen" -#: ../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 "Erwarte child.id > 0. Erhielt {1}" -#: ../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 "Direkte Kinder von Elternrelationen einbeziehen" -#: ../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 "Lade Elternrelationen" -#: ../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 "Lade Elternrelationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "Die ausgewählte Relation bearbeiten" @@ -5356,34 +5766,21 @@ "abgebrochen wurde. Fehlermeldung war: " -#: ../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] "Entferne alte Schlüssel von bis zu {0} Objekt" -msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../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 "Bitte wählen Sie zuerst die gewünschten Koordinaten." -#: ../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 "Bitte geben Sie einen Namen für den Ort an." -#: ../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 "Name des Ortes" -#: ../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 "Bitte wählen Sie erst ein Lesezeichen." @@ -5439,13 +5836,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 "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale." -#: ../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 "Bitte einen Suchbegriff eingeben" -#: ../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 "Kann die Ergebnisse der Ortssuche nicht vom Server laden" @@ -5453,18 +5850,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 "Bitte einen Ortsnamen eingeben, nach dem gesucht werden soll:" -#. 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 "Orte" #. 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 "Name" @@ -5503,37 +5899,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 "Typ" -#: ../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 "bei" -#: ../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 "Zoom" -#: ../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: " @@ -5545,5 +5941,5 @@ "Auswahl: Klick." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Interaktive Karte" @@ -5570,22 +5966,29 @@ msgstr "Kachelnummern" -#: ../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 "Historie für {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 "" -"Warnung: Dialog für die Geschichte von Elementen konnte nicht in den " -"Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#: ../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 "Historie für {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historie für {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Dialog schließen" -#: ../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 "History der markierten Elemente anzeigen" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" @@ -5593,6 +5996,6 @@ "Referenzelements." -#: ../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}" @@ -5601,5 +6004,5 @@ "'{1}' der Geschichte überein" -#: ../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" @@ -5608,5 +6011,5 @@ "der Geschichte nicht vorhanden." -#: ../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 "" @@ -5614,13 +6017,32 @@ "aktuellen Elements." -#: ../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 "Aktuelle Version {0} nicht in der Versionsgeschichte vorhanden!" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Knoten {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "History laden" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "Erwarte child.id > 0. Erhielt {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Lade Historie für {0} mit ID {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Lade Historie für {0} mit ID {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Lade Historie für {0} mit ID {1}" #. item "Streets/Motorway" text "Reference" @@ -5938,14 +6360,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6121,8 +6557,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" #. @@ -6219,4 +6661,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6330,6 +6775,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 @@ -6337,156 +6782,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 "Name" -#: ../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 "" "Version {0} erzeugt am {1} von " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Änderungssatz {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Mehr Informationen zu dieser Vorlage" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Änderungssatz {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6494,32 +6957,288 @@ msgstr "Version {0} erzeugt am {1} von {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Version" -#: ../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 "Straßenname" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Ja" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Nein" + +#: ../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 "Bitte wählen Sie einen Wert" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Merkmalskonflikte beheben" + +#: ../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] "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +#, fuzzy +msgid "Unsafed data non-writable files" +msgstr "Standarddatei zum Merkmale ignorieren verwenden." + +#: ../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 "Verwerfen und Beenden" + +#: ../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 "Speichern und Beenden" + +#: ../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 "Ebene" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Beim Hochladen" + +#: ../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 "Datei" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Es sind keine Objekte zum Aktualisieren ausgewählt." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Bilder für {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 lesen..." -#: ../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 "Keine Zeit für Punkt {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 "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" -#: ../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 "Keine Bilder mit lesbaren Zeitstempel gefunden." -#: ../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 @@ -6527,29 +7246,29 @@ msgstr "Einlesen {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 "Georeferenzierte Bilder" -#: ../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 Start: {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 Ende: {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 "Aktueller Unterschied: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "Zeitzonen Unterschied: " -#: ../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" @@ -6558,14 +7277,14 @@ msgstr[1] "Bilder" -#: ../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} innerhalb der GPS-Spur." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Uhrzeit synchronisieren" -#: ../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 @@ -6573,82 +7292,82 @@ msgstr "JPEG-Bilder (*.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 "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." -#: ../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 "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Bild" -#: ../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 "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" -#: ../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 "Zeitzone des GPS-Geräts (Unterschied zum Foto)" -#: ../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 "Zeit mit GPS-Gerät synchronisieren" -#: ../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 "Die eingegebene Zeit konnte nicht eingelesen werden." -#: ../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-Punkt" -#: ../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 "Linienaussehen anpassen" +#: ../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 "Globale Einstellungen verwenden." + #: ../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 "Globale Einstellungen verwenden." +msgid "Draw lines between points for this layer." +msgstr "Linien zwischen Punkten dieser Ebene zeichnen." #: ../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 "Linien zwischen Punkten dieser Ebene zeichnen." - -#: ../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 "Keine Linien zwischen Punkten dieser Ebene zeichnen." -#: ../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 "Linienaussehen wählen" -#: ../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 "Farben anpassen" -#: ../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 "Voreinstellung" -#: ../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" @@ -6708,5 +7427,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}" @@ -6722,10 +7441,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 "Zur Daten-Ebene konvertieren" #: ../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." @@ -6736,11 +7455,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 @@ -6782,4 +7501,9 @@ "fortfahren?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Daten herunterladen" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6804,65 +7528,65 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../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 "Datenebene {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 "Außerhalb des heruntergeladenen Bereichs" -#: ../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 "Version {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 "" "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 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} besteht aus:" -#: ../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} gelöscht.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "nicht angegeben" -#: ../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-Version: {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 "Zu GPX-Ebene konvertieren" -#: ../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" @@ -6870,5 +7594,5 @@ msgstr[1] "GPS-Spuren" -#: ../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" @@ -6876,5 +7600,5 @@ msgstr[1] "Punkte" -#: ../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" @@ -6883,5 +7607,5 @@ msgstr[1] "Eine GPS-Spur mit {0} Punkten" -#: ../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" @@ -6890,5 +7614,5 @@ msgstr[1] "{0} besteht aus {1} GPS-Spuren" -#: ../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" @@ -6897,9 +7621,9 @@ msgstr[1] "{0} Punkte" -#: ../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-Wegpunkt" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173 +msgstr "GPS-Markierung" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172 msgid "marker" msgid_plural "markers" @@ -6907,5 +7631,5 @@ msgstr[1] "Wegpunkte" -#: ../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" @@ -6926,5 +7650,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}." @@ -6932,5 +7656,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 "Sychronisation in Abspielebene nicht möglich." @@ -6962,5 +7686,5 @@ msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten." -#: ../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 " @@ -6970,5 +7694,5 @@ "Aufnahme abgespielt werden soll (nach der ersten Marke)." -#: ../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 " @@ -6978,29 +7702,29 @@ "sychronisierende Audio-Marke oder den Wegpunkt bewegt werden." -#: ../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 "Konnte Audio-Marke nicht synchronisieren." -#: ../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 "Fehler beim Anzeigen der URL für diesen Wegpunkt" -#: ../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 "(Die URL lautet: " -#: ../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 "Fehler beim Anzeigen der 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 "Erweiterte Einstellungen" -#: ../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 "Einstellungseinträge direkt setzen. Bitte vorsichtig benutzen!" -#: ../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 @@ -7008,27 +7732,27 @@ msgstr "Suche: " -#: ../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 "Aktueller Wert ist Standard." -#: ../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 "Standardwert ist ''{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 "" "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)." -#: ../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 "Bitte wählen Sie eine Zeile zum Bearbeiten." -#: ../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 @@ -7036,14 +7760,14 @@ msgstr "Neuer Wert für {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 "Bitte wählen Sie die zu löschende Zeile." -#: ../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 "Ein neues Schlüssel/Wert-Paar hinzufügen." @@ -7183,40 +7907,40 @@ msgstr "Kalibrierung der Tonaufzeichnung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farbe" -#: ../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 "Zeichenstil {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 "Ebene: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Wählen" -#: ../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 "Eine Farbe für {0} auswählen" -#: ../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 "Voreinstellung" -#: ../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 "Voreinstellung für alle" -#: ../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 "Farben, die von verschiedenen Objekten in JOSM verwendet werden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Farben" @@ -7260,5 +7984,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Auto" @@ -7280,16 +8004,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 "Fahrrad" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7319,12 +8044,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 "Zu Fuß" @@ -7514,5 +8239,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 "Startbild anzeigen" @@ -7520,23 +8245,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 "Objektnummer in Auswahllisten anzeigen" #: ../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 "Objektnummer in Auswahllisten anzeigen" + +#: ../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 "Gummibandhilfslinie zeichnen" -#: ../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 "Modusloses Zeichnen (potlatchartig)" -#: ../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 "Objektnummer in Auswahllisten anzeigen" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Ohne Moduswechsel zeichnen (Arbeitsweise ähnlich zu 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 "Verhalten und Aussehen" @@ -7568,54 +8304,54 @@ msgstr "Benutzter Stil" -#: ../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 "Verfügbare Plugins bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Liste laden" -#: ../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 "Aktualisieren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Seiten konfigurieren..." -#: ../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-Pluginbeschreibungsdatei hinzufügen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" msgstr "URL eingeben" -#: ../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 "Bitte einen Eintrag wählen." -#: ../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-Pluginbeschreibungsdatei ändern." -#: ../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 "URL der JOSM Plugin Beschreibung" -#: ../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 "Pluginquellen bearbeiten" #. 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 "Anzeige-Einstellungen" -#: ../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 " @@ -7623,41 +8359,41 @@ msgstr "Verschiedene Optionen, die das Aussehen des Programms festlegen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: ../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 "Verbindungseinstellungen zum OSM-Server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Karten-Einstellungen" -#: ../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 "Einstellungen der Karten-Projektion und Daten-Interpretation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Audio-Einstellungen" -#: ../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 "Einstellungen für den Audio-Player und Audio-Marken." -#: ../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 "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." -#: ../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 "Koordinaten anzeigen als" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projektionsmethode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Projektionsmethode" @@ -7690,12 +8426,4 @@ msgid "Proxy server password" msgstr "Proxyserver-Passwort" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Die Basis-URL des OSM Servers (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Server Basis-URL" #. 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 @@ -7722,61 +8450,60 @@ msgstr "Tastaturkürzel" -#: ../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 "Kurzbeschreibung: {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 "Autor: {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 "Webseite: {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 "Version: {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 "Symbolpfad" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Standard kopieren" -#: ../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 "Bitte wählen Sie eine Zeile zum Kopieren." -#: ../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 "XML-Einstellungsdatei (URL oder Dateiname) für {0} Definitionen" -#: ../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 "Neue XML-Quelle zur Liste hinzufügen" -#: ../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 "Ausgewählte Quelle aus der Liste entfernen." -#: ../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 "Standard (siehe Tooltip für detailierte Informationen)" @@ -7965,36 +8692,59 @@ msgstr "Steuertastengruppen" -#: ../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] "Entferne alte Schlüssel von bis zu {0} Objekt" +msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Neue Ebene hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Ausgewählte Ebene löschen." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Mehr Informationen zu dieser Vorlage" #. 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 "Optionale Attribute:" -#: ../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 "Verwende Vorlage \"{0}\" aus Gruppe \"{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 "Verwende Vorlage \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "geschlossener Weg" -#: ../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 "Unbekannter Typ: {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 @@ -8002,15 +8752,15 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {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 "Fehler beim Einlesen von {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 "Elemente des Typs {0} werden unterstützt." -#: ../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 @@ -8020,22 +8770,22 @@ msgstr[1] "Ändere {0} Objekte" -#: ../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 "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Einstellungen ändern" -#: ../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}''" @@ -8074,11 +8824,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 "Kann \"{0}\" nicht lesen" -#: ../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 " @@ -8088,38 +8838,38 @@ "unter der GPL stehen, hochladen." -#: ../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 "GPX-Dateien" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "Beschreibung der GPS-Spur" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Information zum Autor hinzufügen." -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Voller Name" -#: ../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 "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Vordefiniert" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Jahr des Copyrights" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Schlüsselwörter" @@ -8129,9 +8879,9 @@ msgstr "Export-Einstellungen" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportieren und Speichern" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8142,10 +8892,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 "Eine vordefinierte Lizenz auswählen" -#: ../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 @@ -8155,12 +8905,12 @@ msgstr "Wegpunkte von {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 "Die Datei \"{0}\" existiert nicht" -#: ../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" @@ -8183,6 +8933,6 @@ "daher unklar." -#: ../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 @@ -8192,20 +8942,40 @@ msgstr "OSM-Daten herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 -#, java-format -msgid "Fetching {0} with id {1} from ''{2}''" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#, fuzzy, java-format +msgid "Fetching node with id {0} from ''{1}''" msgstr "Hole {0} mit id {1} von ''{2}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, fuzzy, java-format +msgid "Fetching way with id {0} from ''{1}''" +msgstr "Hole {0} mit id {1} von ''{2}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#, fuzzy, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "Hole {0} mit id {1} von ''{2}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 -#, java-format -msgid "Fetching a package of {0} from ''{1}''" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#, fuzzy, java-format +msgid "Fetching a package of nodes from ''{0}''" msgstr "Hole ein Paket{0} von ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#, fuzzy, java-format +msgid "Fetching a package of ways from ''{0}''" +msgstr "Hole ein Paket{0} von ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#, fuzzy, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "Hole ein Paket{0} von ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8213,34 +8983,34 @@ msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element" -#: ../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-Dateien" -#: ../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 "Importierte Koordinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Ungültige Datensätze: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Prüfsummenfehler: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Unbekannte Datensätze: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Leere Koordinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA-Einlesen erfolgreich" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA-Einlesen fehlgeschlagen!" @@ -8251,9 +9021,9 @@ msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren." -#: ../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 "Diese JOSM-Version ist mit dem eingestellten Server inkompatibel." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8264,15 +9034,15 @@ "bis {1} unterstützt." -#: ../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 "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../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 "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8282,33 +9052,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 "Öffne Änderungssatz..." -#: ../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 "Öffne Änderungssatz..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Öffne Änderungssatz..." + +#: ../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 "Öffne Änderungssatz..." + +#: ../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 "Schließe Änderungssatz..." -#: ../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 "Schließe Änderungssatz..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Öffne Änderungssatz..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Daten hochladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, fuzzy, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "Starte Wiederholung {0} von {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../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}." @@ -8336,29 +9164,33 @@ msgstr "Ungültige bz2-Datei." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Passwort oder Benutzername falsch." -#: ../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 "Achtung: Das Passwort wird unverschlüsselt übertragen." -#: ../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 "Benutzername und Passwort (unverschlüsselt) speichern" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Passwort eingeben" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Anmelden" -#: ../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 "Die Basis-URL des OSM Servers (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Benutzername (E-Mail) für den OSM-Server." -#: ../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." @@ -8367,13 +9199,17 @@ "soll." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Server Basis-URL" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM-Benutzername (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-Passwort" -#: ../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." @@ -8385,15 +9221,15 @@ "übertragen.
Benutzen Sie kein wertvolles Passwort." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM-Server-Dateien" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "Erwartete eine Instanz von OsmDataLayer. Erhielt ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" @@ -8402,5 +9238,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8411,5 +9247,5 @@ "
Der Fehler lautet:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8622,24 +9458,24 @@ "Internetverbindung." -#: ../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} verbleiben. Überspiele {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 "" -"Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem timeout " -"durch den Server geschlossen. Die Fehlermeldung war: {1}" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 -#, java-format +#: ../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} verbleiben. Überspiele {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} verbleiben. Überspiele {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#, fuzzy, 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." +"use diff uploads, but API is not able to handle them. Ignoring diff upload." msgstr "" "WARNUNG: Einstellung ''{0}'' oder API-Version ''{1}'' des Datensatz " @@ -8647,15 +9483,24 @@ "verarbeiten. Ignorieren der Änderungssätze." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 +#, fuzzy +msgid "Starting to upload in one request ..." +msgstr "Nichts geändert. Erfassen Sie erst einige Daten." + +#: ../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 "Plugins aktualisieren" -#: ../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 "Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8668,5 +9513,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." @@ -8675,23 +9520,23 @@ msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten." -#: ../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 "Plugin {0} herunterladen..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Herunterladen überspringen" -#: ../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 "Für Plugin {1} wird JOSM-Version {0} benötigt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Plugin herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Herunterladen überspringen" @@ -8702,5 +9547,5 @@ msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten." -#: ../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." @@ -8709,25 +9554,25 @@ "benötigt." -#: ../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 "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {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 "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden." -#: ../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 "Plugin nicht gefunden: {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 "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen." -#: ../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 " @@ -8737,22 +9582,22 @@ "Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)" -#: ../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 "Plugin abschalten" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" +msgstr "" +"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" + #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" -"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Plugin behalten" -#: ../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 " @@ -8762,5 +9607,5 @@ "die Rechte besitzt die vorhandenen Plugins zu überschreiben." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8770,10 +9615,10 @@ "ausgelöst haben könnte." -#: ../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 "Laut den Informationen des Plugins ist der Autor des Plugins {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." @@ -8782,9 +9627,9 @@ "Plugins, bevor Sie den Fehler melden." -#: ../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 "Soll das Plugin abgeschaltet werden?" -#: ../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 " @@ -8794,5 +9639,5 @@ "um das Plugin zu entfernen." -#: ../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 "" @@ -8800,9 +9645,9 @@ "deaktiviert." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "Plugin-Information" -#: ../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" @@ -8813,5 +9658,5 @@ msgstr "Mehr Details" -#: ../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" @@ -8820,18 +9665,18 @@ msgstr[1] "Plugin-Informationen von {0} Quellen geladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Keine Plugin-Informationen gefunden." -#: ../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 "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen." -#: ../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 "Alle installierten Plugins sind aktuell." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8844,9 +9689,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 "Fehlende Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8859,35 +9704,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}: Version {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 "Plugin mit JOSM ausgeliefert" -#: ../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 "Fehler beim Lesen der Plugin-Informationsdatei: {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 "Ende der Aufzeichnung überschritten" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Fehler bei der Klangausgabe" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Keine Aktion" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Programmfehler melden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8901,14 +9746,14 @@ "von JOSM einsetzen, würden wir uns über einen Fehlerbericht freuen." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Unerwarteter Fehler" -#: ../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 "Bitte melden Sie den Fehler unter {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 "" @@ -8916,5 +9761,5 @@ "notwendigen Schritte bei!" -#: ../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 " @@ -8924,13 +9769,13 @@ "sowie aller Plugins, bevor Sie den Fehler melden." -#: ../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 "Stellen Sie sicher, dass folgende Informationen enthalten sind:" -#: ../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 "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)" -#: ../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}." @@ -8939,6 +9784,6 @@ "genutzt." -#: ../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 "" @@ -8949,5 +9794,5 @@ "zugegriffen werden. Die Ausnahme lautet: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8958,5 +9803,5 @@ "schwerwiegendes Konfigurationsprobleme." -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8970,5 +9815,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" @@ -8978,5 +9823,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8987,11 +9832,11 @@ "\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 "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)" -#: ../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}" @@ -9000,6 +9845,6 @@ "Fehlermeldung war: {1}" -#: ../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 "" @@ -9009,4 +9854,39 @@ "Warnung: die Nachricht des Tages konnte aus Sicherheitsgründen nicht von " "''{0}'' gelesen werden. Fehlermeldung war: {1}" + +#: ../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 "" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 @@ -9034,9 +9914,27 @@ msgstr "Ein Wegegitter erstellen." -#: ../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 "GPS-Spur hochladen" -#: ../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 @@ -9044,27 +9942,40 @@ msgstr "GPS-Spuren hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Öffentlich" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" +#: ../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 "Beschreibung" -#: ../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 "Bitte Beschreibung für die GPS-Spur angeben." -#: ../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 "Bitte Stichworte für die GPS-Spur angeben." -#: ../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}" @@ -9072,48 +9983,48 @@ #. 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 "Verbinden..." -#: ../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 "Hochladen abgebrochen" -#: ../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 "Fehler beim Hochladen" -#: ../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-Hochladen war erfolgreich" -#: ../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 "" "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " -#: ../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 "GPS-Spur hochladen: {0}% ({1} von {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 "Keine Beschreibung angegeben. Bitte Beschreibungstext ergänzen." -#: ../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 "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen." -#: ../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 "Kein Nutzername angegeben." -#: ../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 "Kein Passwort angegeben." -#: ../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 "GPS-Spur hochladen" @@ -9226,19 +10137,19 @@ msgstr "Einen Satz Bilder als neue Ebene laden." -#: ../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-Dateien (*.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 "Datei {0} ist unter dem Namen \"{1}\" bereits geladen" -#: ../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 "Fehler beim Einlesen von {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." @@ -9250,34 +10161,34 @@ "dem Foto und wählen eine Zeitzone
" -#: ../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 "Fotozeit (aus 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-Zeit (aus obigem Photo): " -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "Ich bin in der Zeitzone von: " -#: ../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 "Kein Datum" -#: ../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 "Ein anderes Foto öffnen" -#: ../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 "Zeit von Foto und GPS-Empfänger synchronisieren" -#: ../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" @@ -9287,29 +10198,29 @@ "Bitte verwenden Sie das geforderte Format" -#: ../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 "Ungültiges Datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 "GPS-Spur: " -#: ../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 "Eine andere GPS-Spur laden" -#: ../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 "Zeitzone: " -#: ../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 "Offset:" -#: ../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 "" @@ -9317,41 +10228,41 @@ "html>" -#: ../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 "Position aktualisieren für: " -#: ../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 "Alle Bilder" -#: ../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 "Bilder ohne EXIF-Position" -#: ../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 "Noch nicht referenzierte Bilder" -#: ../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 "Bilder mit GPS-Spur korrelieren" -#: ../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 "Korrelieren" -#: ../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 "Automatisch ermitteln" -#: ../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 "Wählen Sie eine GPS-Spur" -#: ../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 "Keine GPS-Spur gewählt" -#: ../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 "" @@ -9362,9 +10273,9 @@ "Erwartetes Format: {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 "Ungültige Zeitzone" -#: ../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 "" @@ -9375,26 +10286,26 @@ "Erwartetes Format: {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 "Ungültiger Offset" -#: ../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} Treffer für {1} in GPS-Spur {2} gefunden" -#: ../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 "GPS-Spur geladen" -#: ../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 "Die gewählten Bilder enthalten keine Zeitinformation." -#: ../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 "Bilder enthalten keine Zeitinformation" -#: ../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." @@ -9403,39 +10314,39 @@ "andere." -#: ../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 "GPS-Spur enthält keine Zeitinformationen" -#: ../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 "Zeitzone: {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 "Minuten: {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 "Sekunden: {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} von {1} Bildern mit GPS-Spur synchronisiert." -#: ../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 "(Zeitdifferenz von {0} Tagen)" -#: ../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 "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" -#: ../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 " @@ -9446,13 +10357,13 @@ "synchonisieren." -#: ../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 "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen." -#: ../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 "Zeitzone und Offset anpassen" -#: ../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 "Standardwerte" @@ -9473,5 +10384,5 @@ msgstr "Fehler bei Datei {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9480,16 +10391,18 @@ "(No = new cache)" msgstr "" +"Bereich \"{0}\" wurde im Zwischenspeicher gefunden.\n" +"Soll dieser zuerstbenutzt werden?\n" +"(Nein = Zwischenspeicher wird geleert)" #. this below is a temporary workaround to fix the "always on top" issue #. 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 "Alles auswählen" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +msgstr "Feuille auswählen" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" @@ -9518,8 +10431,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 "" "Stadt {0} nicht gefunden oder im WMS nicht vorhanden.\n" @@ -9530,21 +10443,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 "Wähle eine Kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Wähle aus..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Automatische Quellenangabe" -#: ../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" @@ -9557,37 +10470,51 @@ "Wollen Sie wieder zum Bilder holen nutzen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Tastaturkürzel wiederherstellen" -#: ../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 "JOSM wird zum Aktivieren der Änderung beendet." -#: ../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 "" +"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +"Fehlermeldung ist: {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Ersetze die originalen Hintergrundfarben mit JOSM-Farben" -#: ../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 "Graue Farben invertieren (für schwarze Hintergründe)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Aktiviere transparenten Hindergrund" -#: ../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 "Grenzenlinien der heruntergeladenen Daten zeichnen" -#: ../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 +#, fuzzy +msgid "Disable image cropping during georeferencing." +msgstr "Klicke zur Georeferenzierung auf das zweite Lambert-Kreuz.\n" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Enable automatic caching." msgstr "Automatischen Zwischenspeicher aktivieren." -#: ../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 "Max. Speichergröße (in MB)" -#: ../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." @@ -9605,19 +10532,19 @@ "dieses Plugins erstellt wurden, hochladen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "Französisches Kataster-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 "" "Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Quelle" -#: ../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 " @@ -9627,5 +10554,5 @@ "Hintergrundfarbe ersetzen." -#: ../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). " @@ -9635,9 +10562,9 @@ "Nützlich für Texte auf dunklen Hintergründen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Stapeln mehrerer Schichten erlauben" -#: ../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 "" @@ -9645,33 +10572,31 @@ "durchsichtig." -#: ../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 "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen" #. 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 "Bildladefaktor:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128 +msgstr "Multiplikator für Vektordaten:" + +#: ../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 "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)" -#: ../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 "Feste Quadratgröße (Standard ist 100m)" -#: ../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 "Feste Größe (von 25 bis 1000 Meter)" -#: ../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 "Bildladefaktor:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +msgstr "Multiplikator für Pixelgrafiken:" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9732,12 +10657,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Verbinde zu WMS-Server..." +msgstr "Cadastare WMS wird kontaktiert..." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "Objekt bereits gelöscht" +msgstr "Bild wurde schon geladen." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9746,4 +10669,6 @@ "Use the normal Cadastre Grab menu." msgstr "" +"Gemeinde ist vektorsiert!\n" +"Benutze das normale Cadastre Menü." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20 @@ -9771,64 +10696,84 @@ #: ../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 +#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" "the current projection to one of the cadastre\n" -"projection and retry" +"projections and retry" msgstr "" "Um das Kataster-WMS-Plugin zu aktivieren, ändern Sie die JOSM-Projektion auf " "eine der Katasterprojektionen und starten neu." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 msgid "Grab non-georeferenced image" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:65 +msgstr "Nehme ein nicht georeferenziertes Bild." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68 msgid "Georeferencing interrupted" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:95 +msgstr "Georeferenzierung wude unterbrochen" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 msgid "" "Click first corner for image cropping\n" "(two points required)" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116 +"Klicke in die erste Ecke um das Bild zu beschneiden.\n" +"(Es werden zwei Punkte benötigt.)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 +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 +msgstr "Klicke in die zweite Ecke um das Bild zu beschneiden." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 msgid "" "Click first Lambert crosspiece for georeferencing\n" "(two points required)" 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 +"Klicke zur Georeferenzierung auf das erste Lambert-Kreuz.\n" +"(Es werden zwei Punkte benötigt.)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 #, fuzzy +msgid "Image georeferencing" +msgstr "Nehme ein nicht georeferenziertes Bild." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 +#, fuzzy +msgid "Click second Lambert crosspiece for georeferencing" +msgstr "Klicke zur Georeferenzierung auf das zweite Lambert-Kreuz.\n" + +#: ../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 "Länge und Breite der Sprungposition angeben." - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149 +msgstr "Gib die Cadastre Ost,Nord-Position ein" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 -#, fuzzy +msgstr "(Achtung: Pfeil muss nach Norden zeigen!)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 msgid "East" msgstr "Ost" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 msgid "North" msgstr "Nord" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Set Lambert coordinate" -msgstr "Behalte Server-Koordinaten" +msgid "Set " +msgstr "Auswahl" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9890,8 +10835,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25 msgid "Export as PNG format (only raster images)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +msgstr "Im PNG-Format exportieren (nur Pixelgrafiken)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9915,6 +10860,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 "Leere Ebene" @@ -9930,7 +10875,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Rasterzentrum: {0}" +msgstr "Rastergröße: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10461,6 +11406,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 "Wasser" @@ -10473,8 +11418,4 @@ msgid "land" msgstr "Land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "Kein" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10772,9 +11713,9 @@ msgstr "OpenStreetBugs Lade-Warteschleife" -#: ../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-Einträge anzeigen" -#: ../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 " @@ -10786,5 +11727,5 @@ "neuen Server wechseln? (dringend empfohlen)" -#: ../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 "Zum neuen openstreetbugs-Server wechseln?" @@ -11366,5 +12307,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 "Straßenname" @@ -11383,29 +12324,29 @@ msgstr "Autorenpanel anzeigen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Nutzerseite öffnen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Nutzerseite im Browser öffnen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Nutzerdaten auswählen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Ersetze Auswahl mit Nutzerdaten" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Bitte wählen Sie einige Daten" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Bitten verwenden Sie das Autorenpanel um einen Nutzer zu wählen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Dies funktioniert nicht mit anonymen Nutzern" @@ -11419,25 +12360,15 @@ msgstr "Sich überlappende Flächen miteinander verbinden" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie " -"vorm Hochladen alles." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Trotzdem fortfahren" - -#: ../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 "Momentan können nur maximal zwei Flächen vereinigt werden." -#: ../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}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden." -#: ../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" @@ -11450,38 +12381,38 @@ "Sind Sie sich sicher, dass Sie fortfahren wollen?" -#: ../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 "Bitte abbrechen, falls Sie nicht sicher sind" -#: ../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 "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Knoten auf allen Schnittpunkten erstellt" -#: ../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 "Wege entfernen, die nicht teil des inneren Multipolygons sind" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Relationen korrigieren" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Selbstüberlappende Gebiete verbunden" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Überlappende Gebiete verbunden" -#: ../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 " @@ -11491,81 +12422,81 @@ "prüfen Sie, dass keine Fehler entstanden sind." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Merkmalskonflikte beheben" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Elemente aus Relationen entfernt" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Flächen verbinden: Kurze Wege entfernen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Weg geschlossen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Entferne Merkmale von inneren Wegen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funktion zum Flächen verbinden" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Zu Position springen" -#: ../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 "Einen Dialog zum Springen an eine spezifische Position öffnen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Länge und Breite der Sprungposition angeben." -#: ../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 "Sie können auch eine URL von www.openstreetmap.org einfügen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (in Meter)" -#: ../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 "Dorthin springen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Zu Position springen" -#: ../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 "Länge, Breite oderZoom konnten nicht gelesen werden. Bitte prüfen." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Länge oder Breite nicht lesbar" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Weg vereinfachen" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Unnötige Knotenpunkte eines Weges löschen." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Bitte mindestens einen Weg zum Vereinfachen auswählen." -#: ../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?" @@ -11579,25 +12510,25 @@ "sollen?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: ../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 "Ergebnisse der Datenprüfung" -#: ../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 "Keine Fehler gefunden" -#: ../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 "Raster" -#: ../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 "" @@ -11688,53 +12619,53 @@ msgstr "Datenprüfung ausführen" -#: ../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 "Die Daten enthalten Fehler. Trotzdem hochladen?" -#: ../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 "Fenster mit dem Ergebnis der Prüfung öffnen." -#: ../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 "Zoom auf Problem" -#: ../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 "Reparieren" -#: ../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 "Ausgewählte Fehler korrigieren." -#: ../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 "Ignorieren" -#: ../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 "Ausgewählte Fehler beim nächsten Mal ignorieren." -#: ../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 "Komplette Gruppe" -#: ../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 "Einzelne Elemente" -#: ../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 "Nichts" -#: ../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 "Ganze Gruppe oder einzelne Elemente ignorieren?" -#: ../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 "Elemente ignorieren" -#: ../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" @@ -11758,23 +12689,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 "" "Dieser Test prüft, ob zwei Straßen, Eisenbahnlinien oder Wasserwege sich in " "der selben Ebene überschneiden, aber nicht durch einen Knoten verbunden sind." -#: ../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 "Gebäude erstellen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Überschneidende Wege" -#: ../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 "Doppelte Knoten" -#: ../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 "Dieser Test überprüft auf doppelte Knoten an der selben Stelle." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Knoten mit demselben Namen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Bestätigung" + +#: ../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 "Weg duplizieren" + +#: ../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 "Dieser Test überprüft auf doppelte Knoten an der selben Stelle." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Weg duplizieren" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11864,23 +12828,23 @@ "könnte." -#: ../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 "Eigenschaftsprüfer:" -#: ../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 "Dieses Plugin prüft auf Fehler in Schlüsseln und Werten" -#: ../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 "Ungültige Zeile im Merkmalsprüfer - {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 "Ungültige Zeile im Rechtschreibprüfer: {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 "" @@ -11891,7 +12855,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 "Ungültige Schlüssel/Wert-Kombinationen" @@ -11899,80 +12863,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 "Zeichenproblem" -#: ../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 "Schlüssel \"{0}\" ungültig." -#: ../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 "Merkmale mit leerem Wert" -#: ../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 "Ungültiger Schlüssel" -#: ../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 "Ungültiger Leerraum in Schlüssel" -#: ../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 "Werte beginnen oder enden mit Leerraum" -#: ../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 "Werte enthalten HTML-Entität" -#: ../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 "Schlüssel \"{0}\" nicht in Vorlagen." -#: ../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 "Vorlagen enthalten Schlüssel nicht" -#: ../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 "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen." -#: ../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 "Vorlagen enthalten Wert nicht" -#: ../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 "Korrekturnotizen" -#: ../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 "Schlüssel prüfen." -#: ../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 "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen." -#: ../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 "Komplexen Eigenschaftsprüfer verwenden." -#: ../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 "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen." +#: ../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 "Datenquelle für Merkmalsprüfer" -#: ../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." @@ -11982,29 +12946,29 @@ "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung." -#: ../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 "Eine neue Quelle zur Liste hinzufügen." -#: ../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 "Ausgewählte Quelle bearbeiten." -#: ../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 "Datenquellen" -#: ../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 "Werte überprüfen." -#: ../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 "Prüft die Gültigkeit von Werten anhand von Objektvorlagen." -#: ../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 "Auf Korrekturnotizen prüfen." -#: ../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 "" @@ -12012,55 +12976,55 @@ "(fixme) stehen haben." -#: ../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 "Zeichennotizen prüfen." -#: ../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 "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind." -#: ../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 "Standarddatendatei verwenden." -#: ../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 "Nutzung der Standarddatendatei (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 msgid "Use default tag ignore file." msgstr "Standarddatei zum Merkmale ignorieren verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use the default tag ignore file (recommended)." msgstr "" "Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)." -#: ../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 "Standarddatei für Schreibprüfung verwenden." -#: ../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 "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)." -#: ../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 "Eigenschaften korrigieren" -#: ../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 "Konnte Elementtyp nicht finden" -#: ../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 "Konnte Warnlevel nicht finden" -#: ../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 "Ungültiger Ausdruck \"{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}''" @@ -12205,7 +13169,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 "Gebäude" @@ -12219,5 +13183,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 "Fläche" @@ -12365,5 +13329,5 @@ msgstr "Kreuzung erreicht" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Fehler" @@ -12431,14 +13395,14 @@ msgstr "Hilfe für WMS-Plugin" -#: ../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 "Berichtigtes Bild..." -#: ../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 "Berichtigte Bilder von verschiedenen Diensten herunterladen" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12449,26 +13413,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 "Angepasste WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Unterstützte Berichtigungsservices:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Webseite besuchen" -#: ../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 oder Bild-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 "Berichtigtes Bild hinzufügen" -#: ../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 " @@ -12478,37 +13442,55 @@ "zugeordnet werden. Bitte versuchen Sie es erneut." -#: ../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 "Keine gültige WMS-URL oder ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "WMS justieren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust the position of the selected WMS layer" msgstr "Die Position der gewählten WMS-Ebene anpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." msgstr "Bitte wählen Sie die zu justierende WMS-Ebene." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" msgstr "WMS-Ebene wählen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" msgstr "Justierung starten" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 msgid "There are currently no WMS layer to adjust." msgstr "Es existieren momentan keine justierbaren WMS-Ebenen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 msgid "No layers to adjust" msgstr "Keine Ebenen zum justieren" -#: ../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 "" @@ -12523,15 +13505,43 @@ msgstr "Automatisches Laden" -#: ../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 "Aktivieren" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {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-Ebene ({0}): Laden mit Zoom {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 "Ungültiges Datum" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12540,90 +13550,102 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../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}" msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../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 "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Einstellungen für WMS-Plugin" -#: ../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 "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden" -#: ../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 "Menüname" -#: ../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-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Menüname (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS-URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Standard kopieren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Bitte mindestens einen Weg wählen." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Herunterladeprogramm:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "TCX-Dateien (*.tcx)" #. * @@ -13041,62 +14063,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 "Referenz" - -#. 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 "Ebene" #. item "Streets/Motorway" combo "Layer" @@ -13111,5 +14078,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 "Spuren" @@ -13124,5 +14091,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" @@ -13132,10 +14098,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 "Höchstgeschwindigkeit (km/h)" @@ -13179,9 +14145,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 "Einbahnstraße" @@ -13229,13 +14195,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 "Brücke" @@ -13277,13 +14243,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 "Tunnel" @@ -13323,12 +14289,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 "Senke" @@ -13368,12 +14334,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 "Straßendamm" @@ -13529,17 +14495,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 "Breite (Meter)" @@ -13566,4 +14532,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" @@ -13582,11 +14549,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 "Oberfläche" @@ -13596,4 +14564,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" @@ -13608,9 +14577,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 "befestigt" @@ -13618,10 +14588,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 "unbefestigt" + +#: 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 "Ferienhaus" + +#: 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 "Beton" + +#: 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 "Vermietung" + +#. 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 "Naturwald" + +#: 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 "Parkscheine" #. item "Ways/Track Grade 2" combo "Surface" @@ -13629,12 +14662,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 "gepflastert" + +#: 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 "Schotter" + +#: 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 "gepflastert" + +#: 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 "unvollständig" + +#: 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 "Gras" + +#: 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 "Gras" + +#: 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 "Sand" + +#. 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 "Erde" #. item "Streets/Residential" text "Width (meters)" @@ -13715,20 +14830,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Straßeneinschränkungen" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Straßeneinschränkungen bearbeiten" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Maut" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Kein Ausgang (Sackgasse)" @@ -13741,8 +14856,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 "Zugang" @@ -13777,32 +14892,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 "ja" @@ -13815,40 +14945,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 "Privat" -#: 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 "Nutzungsart beschildert" @@ -13861,19 +14991,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 "Anlieger" @@ -13896,65 +15026,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 "privat gestattet" -#: 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 "Agrar & Forst" -#: 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 "nein" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Waren" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Schwerlast (hgv)" @@ -13969,10 +15104,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 "Pferd" @@ -13988,17 +15123,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 "Motorrad" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -14010,30 +15144,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 "Automobil" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Öffentlicher Service (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorboot" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Boot" #. 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 "Min. Geschwindigkeit (km/h)" @@ -14041,25 +15175,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 "Max. Gewicht (Tonnen)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. Höhe (Meter)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. Breite (Meter)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. Länge (Meter)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Kreisverkehr" @@ -14070,5 +15204,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 "Kreuzung bearbeiten" @@ -14084,5 +15218,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" #. @@ -14090,9 +15224,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 "Typ" @@ -14112,10 +15246,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 "Autobahn" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "Autobahnanschluß" @@ -14137,10 +15271,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 "Schnellstraße" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "Schnellstraßenanschluß" @@ -14162,10 +15296,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 "Bundesstraße" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "Bundesstraßenanschluß" @@ -14187,5 +15321,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" @@ -14200,9 +15334,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "Kreisstraße" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "Verbindungsstraße" @@ -14216,9 +15350,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "Ortsstraße" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "Spielstraße" @@ -14248,10 +15382,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 "Service" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "Spurbus" @@ -14281,6 +15415,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 "Baustelle" @@ -14291,10 +15425,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 "Brücke bearbeiten" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Tunnel bearbeiten" @@ -14302,19 +15436,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Wege" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Baustelle" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Eine im Bau befindliche Straße bearbeiten" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Kreuzung" @@ -14330,5 +15464,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "Kreisverkehr" @@ -14337,5 +15471,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Reitweg" @@ -14343,5 +15477,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Reitweg bearbeiten" @@ -14349,5 +15483,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Fahrradweg" @@ -14357,11 +15491,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 "Fahrradweg bearbeiten" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Fußgängerzone" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Fußweg" @@ -14370,11 +15510,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Fußweg bearbeiten" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Spikes / Dornen" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Fußgängerzone" @@ -14383,5 +15529,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Fußgängerzone bearbeiten" @@ -14389,5 +15535,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Treppe" @@ -14397,5 +15543,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 "Treppe bearbeiten" @@ -14404,5 +15550,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Feld- oder Waldweg" @@ -14411,39 +15557,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Feld- oder Waldweg bearbeiten" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "Beton" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "Schotter" - -#. 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 "Erde" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "Gras" - -#: 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 "Sand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Feldweg Grad 1 (asphaltiert)" @@ -14452,5 +15570,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Feld- oder Waldweg Grad 1 (asphaltiert) bearbeiten" @@ -14458,5 +15576,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Feldweg Grad 2 (Schotter)" @@ -14465,5 +15583,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Feld- oder Waldweg Grad 2 (Schotter) bearbeiten" @@ -14471,5 +15589,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Feldweg Grad 3 (befestigt)" @@ -14478,5 +15596,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Feld- oder Waldweg Grad 3 (befestigt) bearbeiten" @@ -14484,5 +15602,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Feldweg Grad 4 (wenig befestigt)" @@ -14491,5 +15609,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Feld- oder Waldweg Grad 4 (wenig befestigt) bearbeiten" @@ -14497,5 +15615,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Feldweg Grad 5 (unbefestigt)" @@ -14504,5 +15622,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Feld- oder Waldweg Grad 5 (unbefestigt) bearbeiten" @@ -14511,5 +15629,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Pfad" @@ -14518,19 +15636,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Pfad bearbeiten" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Schneemobil" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. 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 "Wanderweg" @@ -14540,5 +15661,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 "Wanderweg bearbeiten" @@ -14546,5 +15667,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Bergwanderweg" @@ -14554,5 +15675,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 "Bergwanderweg bearbeiten" @@ -14560,5 +15681,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Anspruchsvoller Bergwanderweg" @@ -14568,5 +15689,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 "Anspruchsvollen Bergwanderweg bearbeiten" @@ -14574,5 +15695,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Alpiner Wanderweg" @@ -14582,5 +15703,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 "Alpinen Wanderweg bearbeiten" @@ -14588,5 +15709,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Anspruchsvoller alpiner Wanderweg" @@ -14596,5 +15717,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 "Anspruchsvollen alpinen Wanderweg bearbeiten" @@ -14602,5 +15723,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Schwerer alpiner Wanderweg" @@ -14610,5 +15731,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 "Schweren alpinen Wanderweg bearbeiten" @@ -14616,10 +15737,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Wegpunkte" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Autobahnkreuz" @@ -14627,15 +15748,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Autobahnkreuz bearbeiten" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Rastplatz / Autohof" @@ -14643,5 +15764,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Rastplatz / Autohof bearbeiten" @@ -14655,4 +15776,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" #. @@ -14672,18 +15795,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 "Betreiber" @@ -14692,5 +15817,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Ampel" @@ -14700,5 +15825,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Typ des Fußgängerüberwegs" @@ -14707,27 +15832,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 "unkontrolliert" -#: 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 "Ampel" -#: 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 "Insel" -#: 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 "unmarkiert" #. 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 "Zu Pferd" @@ -14735,6 +15860,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 "Mit Fahrrad" @@ -14743,11 +15868,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 "Begleitperson" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Übergangstyp (UK)" @@ -14755,30 +15880,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 "Zebrastreifen" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "Ampel (Pelikan)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "Fußgängerampel (Toukan)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "Fußgängerampel (Puffin)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "Zebrastreifen (Tiger)" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stopp-Schild" @@ -14786,5 +15911,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Fußgängerüberweg" @@ -14793,14 +15918,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Fußgängerüberweg bearbeiten" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Typname (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Kleiner Kreisverkehr" @@ -14811,14 +15936,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 "Richtung" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "Im Uhrzeigersinn" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Wendestelle" @@ -14828,20 +15953,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 "Ortseingangsschild" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Ortseingangsschild bearbeiten" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Zweiter Name" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Geschwindigkeitsüberwachung" @@ -14849,5 +15974,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Notfalltelefon" @@ -14855,5 +15980,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Steigung" @@ -14861,5 +15986,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Starke Steigung" @@ -14868,10 +15993,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Furt" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Furt bearbeiten" @@ -14879,5 +16004,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Gebirgspass" @@ -14885,5 +16010,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Gebirgspass bearbeiten" @@ -14891,11 +16016,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 "Höhe" @@ -14903,5 +16028,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barrieren" @@ -14909,5 +16034,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Poller" @@ -14915,5 +16040,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Poller bearbeiten" @@ -14958,16 +16083,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 "Erlaubter Verkehr:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Umlaufgitter" @@ -14976,5 +16101,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Steinblock" @@ -14982,5 +16107,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Viehgitter" @@ -14988,10 +16113,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Viehgitter bearbeiten" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Busschleuse" @@ -14999,15 +16124,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Spikes / Dornen" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Spikes / Dornen bearbeiten" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Mautstation" @@ -15015,5 +16140,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Mautstation bearbeiten" @@ -15021,10 +16146,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Grenzkontolle" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Grenzkontrolle bearbeiten" @@ -15034,5 +16159,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Hecke" @@ -15041,5 +16166,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Zaun" @@ -15048,5 +16173,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mauer" @@ -15054,5 +16179,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Stadtmauer" @@ -15061,5 +16186,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Stützmauer" @@ -15071,15 +16196,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Eingang" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Eingang bearbeiten" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Gatter / Tor" @@ -15087,50 +16212,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Gatter / Tor bearbeiten" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Schlagbaum" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Schlagbaum bearbeiten" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Drahtgatter" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Drahtgatter bearbeiten" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Fahrzeuggatter" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Fahrzeuggatter bearbeiten" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Personengatter" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Personengatter bearbeiten" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Zauntreppe" @@ -15138,25 +16263,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Zauntreppe bearbeiten" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1017 +#: build/trans_presets.java:1022 msgid "Turnstile" msgstr "Drehsperre" #. item -#: build/trans_presets.java:1018 +#: build/trans_presets.java:1023 msgid "Edit Turnstile" msgstr "Drehsperre bearbeiten" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1026 +#: build/trans_presets.java:1031 msgid "Sally Port" msgstr "Durchgangsschleuse" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Durchgangsschleuse bearbeiten" @@ -15167,10 +16292,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 "Wasser" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Quelle" @@ -15178,5 +16303,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Quelle bearbeiten" @@ -15184,5 +16309,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Abwassergraben" @@ -15190,10 +16315,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Abwassergraben bearbeiten" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Bach" @@ -15201,10 +16326,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Bach bearbeiten" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -15212,10 +16337,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Kanal bearbeiten" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Fluß" @@ -15225,5 +16350,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 "Fluss bearbeiten" @@ -15231,15 +16356,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Wasserfläche bearbeiten" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Landfläche bearbeiten" @@ -15247,15 +16372,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Wasserbecken" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Wasserbecken bearbeiten" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Speicherbecken" @@ -15263,15 +16388,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Speicherbecken bearbeiten" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Überdecktes Speicherbassin" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Überdecktes Speicherbassin bearbeiten" @@ -15279,5 +16404,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Flußbett" @@ -15286,10 +16411,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Flußbett bearbeiten" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Feuchtgebiet" @@ -15300,14 +16425,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 "Feuchtgebiet bearbeiten" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Sumpf" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "Moor" @@ -15321,35 +16446,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "Marsch" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "Röhricht" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "Salzwiese" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "Watt" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "Mangroven" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Schlick & Moor" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Schlickiges Gebiet bearbeiten" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Strand" @@ -15357,20 +16482,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Strand bearbeiten" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Meeresbucht" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Meeresbucht bearbeiten" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Klippe" @@ -15378,10 +16503,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Klippe bearbeiten" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Küstenlinie" @@ -15389,5 +16514,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Küstenlinie bearbeiten" @@ -15395,5 +16520,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Fährroute" @@ -15401,5 +16526,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Fährroute bearbeiten" @@ -15408,5 +16533,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Bootswerft" @@ -15414,10 +16539,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Bootswerft bearbeiten" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dock" @@ -15425,5 +16550,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Dock bearbeiten" @@ -15431,5 +16556,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Damm" @@ -15437,15 +16562,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Damm bearbeiten" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Gewässerpunkte" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Schleusentor" @@ -15454,5 +16579,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Wehr" @@ -15460,20 +16585,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Wehr bearbeiten" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Wasserfall" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Wasserfall bearbeiten" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Wendepunkt" @@ -15482,15 +16607,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Jachthafen" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Jachthafen bearbeiten" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Anlegestelle (Pier)" @@ -15498,10 +16623,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Anlegestelle (Pier) bearbeiten" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Fährstelle" @@ -15509,10 +16634,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Fährstelle bearbeiten" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Bootshebeanlage" @@ -15522,5 +16647,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 "Bootshebeanlage bearbeiten" @@ -15528,10 +16653,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Eisenbahn" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Eisenbahn" @@ -15539,5 +16664,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Eisenbahn bearbeiten" @@ -15567,8 +16692,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 "Optionale Typen" @@ -15582,35 +16707,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 "Rangiergleis" -#: 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 "Abstellgleis" -#: 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 "Firmenanschlußgleis" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Schmalspurbahn" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Schmalspurbahn bearbeiten" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Einschienenbahn" @@ -15618,45 +16743,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Einschienenbahn bearbeiten" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Museumsbahn" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Museumsbahn bearbeiten" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "S-Bahn" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "S-Bahn bearbeiten" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "U-Bahn" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "U-Bahn bearbeiten" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Straßenbahn" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Straßenbahn bearbeiten" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Spurbus" @@ -15664,5 +16789,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Spurbusstrecke bearbeiten" @@ -15671,14 +16796,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Stillgelegte Strecke" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Stillgelegte Strecke bearbeiten" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Strecke abgebaut" @@ -15687,5 +16812,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Bahnübergang" @@ -15694,5 +16819,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "(Fuß-)Übergang" @@ -15702,5 +16827,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Type des Übergangs" @@ -15708,5 +16833,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Drehscheibe" @@ -15715,10 +16840,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Seilbahnen" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Sessellift" @@ -15726,10 +16851,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Sessellift bearbeiten" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Schlepplift" @@ -15737,10 +16862,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Schlepplift bearbeiten" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Seilbahn" @@ -15748,10 +16873,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Seilbahn bearbeiten" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Gondelbahn" @@ -15759,5 +16884,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Gondelbahn bearbeiten" @@ -15765,5 +16890,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 "Station" @@ -15774,10 +16899,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 "Bahnhof bearbeiten" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Tankstelle" @@ -15787,9 +16912,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 "Tankstelle bearbeiten" #. 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 "Öffnungszeiten" + +#. 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" @@ -15809,106 +17163,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Parken bearbeiten" #. 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 "Referenznummer" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "Parkhaus" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "ebenerdig" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "Tiefgarage" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Park&Ride" + +#. 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 "Gebühr" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapazität" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Behindertenparkplätze" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Behindertenparkplätze" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Behindertenparkplätze" + +#: 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 "Autowäsche" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Autowäsche bearbeiten" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Geschäft" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Autohaus bearbeiten" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Werkstatt" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Autowerkstatt bearbeiten" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Vermietung" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Autovermietung bearbeiten" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Autotausch / Car Sharing" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Autotausch (Car Sharing) bearbeiten" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Fahrradparkplatz bearbeiten" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapazität" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "ebenerdig" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "Parkhaus" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "Tiefgarage" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "Park&Ride" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Behindertenparkplätze" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Gebühr" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Autowäsche" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Autowäsche bearbeiten" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Geschäft" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Autohaus bearbeiten" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Werkstatt" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Autowerkstatt bearbeiten" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Vermietung" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Autovermietung bearbeiten" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Autotausch / Car Sharing" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Autotausch (Car Sharing) bearbeiten" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Fahrradparkplatz bearbeiten" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Fahrradleihstelle bearbeiten" @@ -15917,15 +17306,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Fahrradladen bearbeiten" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Öffentliche Verkehrsmittel" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Referenz" @@ -15933,5 +17322,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Eisenbahnhaltepunkt" @@ -15939,5 +17328,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Haltepunkt bearbeiten" @@ -15945,5 +17334,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Straßenbahnhaltestelle" @@ -15952,5 +17341,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Straßenbahnhaltestelle bearbeiten" @@ -15958,5 +17347,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Bahnsteig" @@ -15965,5 +17354,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Bahnsteig bearbeiten" @@ -15975,5 +17364,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 "Referenznummer (Steig)" @@ -15981,10 +17370,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 "Fläche" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "U-Bahn-Eingang" @@ -15993,10 +17382,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "U-Bahn-Eingang bearbeiten" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rollstuhl" @@ -16005,5 +17394,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busbahnhof" @@ -16012,5 +17401,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Busbahnhof bearbeiten" @@ -16018,5 +17407,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bushaltestelle" @@ -16026,5 +17415,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 "Bushaltestelle bearbeiten" @@ -16033,8 +17422,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 "Schutzraum" @@ -16042,10 +17429,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Bussteig" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Bussteig bearbeiten" @@ -16053,5 +17440,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -16059,5 +17446,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Taxihaltepunkt bearbeiten" @@ -16065,5 +17452,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Flughafen" @@ -16071,15 +17458,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Flughafen bearbeiten" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -16088,5 +17475,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Unterkunft" @@ -16098,5 +17485,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -16105,15 +17492,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Hotel bearbeiten" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Sterne" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -16121,20 +17508,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Motel bearbeiten" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Gästehaus (Bed & Breakfast)" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Gästehaus bearbeiten" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Ferienhaus" @@ -16142,10 +17529,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Ferienhaus bearbeiten" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Jugendherberge" @@ -16153,30 +17540,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Jugendherberge bearbeiten" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Alpenhütte" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Alpenhütte bearbeiten" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Wohnwagenstellplätze" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Wohnwagenstellplätze bearbeiten" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Campingplatz" @@ -16184,10 +17571,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Campingplatz bearbeiten" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Essen & Trinken" @@ -16198,5 +17585,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -16204,5 +17591,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Restaurant bearbeiten" @@ -16210,5 +17597,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 "Küche" @@ -16216,61 +17603,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 "italienisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chinesisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "Pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "Hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "griechisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "deutsch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "Döner" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "türkisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thailändisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexikanisch" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japanisch" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Imbiss (Fast Food)" @@ -16278,9 +17665,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Imbiss (Fast Food-Restaurant) bearbeiten" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Café" @@ -16288,10 +17675,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Café bearbeiten" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Kneipe" @@ -16299,20 +17685,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Kneipe bearbeiten" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Biergarten bearbeiten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16320,10 +17704,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Bar bearbeiten" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Nachtclub" @@ -16331,33 +17714,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Nachtclub bearbeiten" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Tourismus" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attraktion" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Attraktion bearbeiten" -#. 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 "Öffnungszeiten" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -16365,10 +17739,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Museum bearbeiten" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16377,10 +17750,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Zoo bearbeiten" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Aussichtspunkt" @@ -16388,25 +17760,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Aussichtspunkt bearbeiten" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Aussichtsturm" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Themenpark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Themenpark bearbeiten" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Kunstausstellung" @@ -16414,5 +17785,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Kunstausstellung bearbeiten" @@ -16420,86 +17791,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Informationsbüro" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Informationsbüro bearbeiten" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Karte" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Kartentyp" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "Karte" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "Stadtplan" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "Wanderkarte" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "Fahrradkarte" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stopp-Schild" + +#. 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 "Straße" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chinesisch" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Bereich laden" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Einfügen" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Großstadt" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regional" #. 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 "Nähere Beschreibung" #. 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 "Radfahren" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Bergwanderweg" + +#. 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 "Skifahren" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "Abstellgleis" + +#. 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 "Informationstafel" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Tafeltyp" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "Infotafel" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Grenzkontolle" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "Anfänger" + +#: build/trans_presets.java:1737 msgid "history" msgstr "Geschichte" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "Natur" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "Wildtiere" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "Landfläche" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Wegweiser (Wandern)" -#. 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 "Information" + +#. 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 "Nähere Beschreibung" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Telefonnummer" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Andere Informationspunkte" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Schutzraum bearbeiten" @@ -16507,25 +18003,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 "Feuerstelle" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Picknickplatz" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Picknickplatz bearbeiten" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historische Stätten" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Burg / Schloß" @@ -16534,20 +18030,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Burg / Schloß bearbeiten" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruinen" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Ruinen bearbeiten" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Ausgrabungsstelle" @@ -16556,10 +18051,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Ausgrabungsstelle bearbeiten" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Schlachtfeld" @@ -16567,5 +18061,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Schlachtfeld bearbeiten" @@ -16573,15 +18067,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Baudenkmal" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Baudenkmal bearbeiten" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Gedenkstätte" @@ -16589,45 +18083,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Gedenkstätte bearbeiten" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Wegkreuz" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Wegkreuz bearbeiten" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Bildstock" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Bildstock bearbeiten" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Freizeit" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Schwimmbad" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Schwimmbad bearbeiten" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Spielplatz" @@ -16635,15 +18129,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Spielplatz bearbeiten" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Angeln" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Angelplatz bearbeiten" @@ -16651,15 +18145,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sporteinrichtungen" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Stadion bearbeiten" @@ -16673,6 +18167,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 "Sportart wählen:" @@ -17064,30 +18558,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 "Sport" @@ -17097,227 +18591,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 "Mehrfachnutzung" -#: 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 "Bogenschießen" -#: 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 "Leichtathletik" -#: 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 "Australian Football" -#: 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 "Baseball" -#: 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 "Basketball" -#: 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 "Boule" -#: 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 "Bowls" -#: 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 "Kanu" -#: 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 "Klettern" -#: 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 "Kricket" -#: 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 "Kricketnetze" -#: 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 "Krocket" -#: 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 "Fahrradfahren" -#: 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 "Hunderennen" -#: 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 "Reiten" -#: 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 "American Football" -#: 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 "Golf" -#: 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 "Gymnastik" -#: 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 "Hockey" -#: 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 "Pferderennen" -#: 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 "Motorsport" -#: 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 "Pelota" -#: 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 "Schlagball (Racquet)" -#: 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 "Rugby" -#: 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 "Schießen" -#: 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 "Skateboard" -#: 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 "Eislaufen" -#: 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 "Skifahren" -#: 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 "Fußball" -#: 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 "Schwimmen" -#: 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 "Tischtennis" -#: 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 "Tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sporthalle / Fitnesscenter" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Sporthalle / Fitnesscenter bearbeiten" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Spielfeld" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Spielfeld bearbeiten" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Rennbahn" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Rennbahn bearbeiten" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfanlage" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Golfanlage bearbeiten" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Minigolfplatz bearbeiten" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Mehrfachnutzung" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Mehrfach genutzten Sportplatz bearbeiten" @@ -17356,248 +18848,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 "Spielfeld" -#: 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 "Sporthalle / Fitnesscenter" -#: 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 "Stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Bowlinghalle bearbeiten" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Leichtathletik" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Leichtathletikfeld bearbeiten" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Bogenschießen" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Bogenschießplatz bearbeiten" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klettern" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Kletterbereich bearbeiten" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kanufahren" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Kanufahrtstrecke bearbeiten" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Radfahren" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Radsporthalle oder -kurs bearbeiten" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Hunderennen" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Trainingsplatz für Hunde bearbeiten" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Reitplatz" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Reitplatz bearbeiten" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Pferderennen" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Pferderennplatz bearbeiten" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastik" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Gymnastikbereich bearbeiten" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorsport" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Motorsportplatz bearbeiten" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Eislaufen" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Eislaufbahn bearbeiten" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Skateboardplatz bearbeiten" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Schwimmen" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Schwimmbad bearbeiten" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Skifahren" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Skipiste bearbeiten" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Pistentyp" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "Abfahrt" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "Langlauf" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "Schneepark" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Schwierigkeit" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "Anfänger" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "einfach" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "mittelschwer" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "fortgeschritten" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "Experte" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "Freistil" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Schießen" @@ -17605,178 +19089,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Schießbahn bearbeiten" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Ballsport" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fußball" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Fußballplatz bearbeiten" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "American Football" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "American Football-Platz bearbeiten" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australian Football" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Australian Foootball-Platz bearbeiten" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Baseballplatz bearbeiten" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Basketballplatz bearbeiten" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golfplatz" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Golfplatz bearbeiten" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "Golfanlage" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Boule-Spielbereich bearbeiten" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowls" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Bowls-Spielfeld bearbeiten" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Kricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Kricketspielfeld bearbeiten" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Kricketnetze" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Kricketnetze bearbeiten" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Krocket" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Krocketspielfeld bearbeiten" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Hockeyplatz bearbeiten" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Pelotaplatz bearbeiten" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Schlagball (Racquet)" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Schlagball (Racquet)-Platz bearbeiten" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Rugbyplatz bearbeiten" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Tischtennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Tischtennisplatz bearbeiten" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Tennisplatz bearbeiten" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Gebäude" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Gebäude" @@ -17784,5 +19268,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Öffentliches Gebäude" @@ -17790,10 +19274,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Öffentliches Gebäuden bearbeiten" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Rathaus" @@ -17801,10 +19285,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Rathaus bearbeiten" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Botschaft" @@ -17812,10 +19296,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Botschaft bearbeiten" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Gericht" @@ -17824,10 +19308,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Gericht bearbeiten" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Gefängnis" @@ -17836,10 +19320,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Gefängnis bearbeiten" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Polizei" @@ -17849,10 +19333,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 "Polizei bearbeiten" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Feuerwache" @@ -17861,10 +19345,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Feuerwache bearbeiten" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Post" @@ -17872,5 +19356,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Post bearbeiten" @@ -17878,15 +19362,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Kindergarten" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Kindergarten bearbeiten" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Schule" @@ -17894,10 +19378,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Schule bearbeiten" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universität" @@ -17905,10 +19389,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Universität bearbeiten" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Hochschule" @@ -17916,5 +19400,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "College bearbeiten" @@ -17922,5 +19406,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kino" @@ -17929,10 +19413,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Kino bearbeiten" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliothek" @@ -17941,10 +19425,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Bibliothek bearbeiten" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Kulturzentrum" @@ -17952,10 +19435,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Kulturzentrum bearbeiten" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Theater" @@ -17964,10 +19447,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Theater bearbeiten" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Kirche" @@ -17977,5 +19460,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 "Kirche bearbeiten" @@ -17984,6 +19467,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 "Religion" @@ -17992,66 +19475,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 "bahaiistisch" -#: 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 "buddhistisch" -#: 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 "christlich" -#: 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 "hinduistisch" -#: 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 "jainistisch" -#: 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 "jüdisch" -#: 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 "moslemisch" -#: 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 "sikhistisch" -#: 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 "spiritistisch" -#: 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 "taoistisch" -#: 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 "unitarisch" -#: 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 "zoroastrisch" -#: 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 "Konfession" @@ -18060,81 +19543,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 "anglikanisch" -#: 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 "baptistisch" -#: 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 "katholisch" -#: 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 "evangelikal" -#: 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 "Zeugen Jehovas" -#: 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 "lutherisch" -#: 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 "methodistisch" -#: 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 "mormonisch" -#: 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 "orthodox" -#: 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 "Pfingstgemeinde" -#: 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 "presbyterianisch" -#: 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 "protestantisch" -#: 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 "Quäker" -#: 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 "schiitisch" -#: 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 "sunnitisch" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adressen" @@ -18143,5 +19626,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Adressinformationen bearbeiten" @@ -18149,5 +19632,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Hausnummer" @@ -18155,20 +19638,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Hausname" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Ortsname" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postleitzahl" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Länderkennung" @@ -18176,5 +19659,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -18183,5 +19666,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Adressinterpolation bearbeiten" @@ -18189,71 +19672,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Nummernschema" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "ungerade" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "gerade" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "alle" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alphabetisch" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Zivilisationsbauten" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabrik" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Fabrik bearbeiten" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Turm" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Turm bearbeiten" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Wasserturm" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Wasserturm bearbeiten" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasometer" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Gasometer bearbeiten" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Leuchtturm" @@ -18261,10 +19740,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Leuchtturm bearbeiten" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Windmühle" @@ -18272,10 +19751,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Windmühle bearbeiten" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Pipeline" @@ -18283,10 +19762,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Pipeline bearbeiten" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Kläranlage" @@ -18296,10 +19775,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 "Kläranlage bearbeiten" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Stationärer Kran" @@ -18307,10 +19786,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Stationären Kran bearbeiten" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Bake" @@ -18318,10 +19797,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Bake bearbeiten" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Vermessungspunkt" @@ -18329,10 +19808,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Vermessungspunkt bearbeiten" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Überwachungskamera" @@ -18340,5 +19819,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Überwachungskamera bearbeiten" @@ -18346,5 +19825,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Stromgenerator" @@ -18354,39 +19833,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 "Stromgenerator bearbeiten" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "Wind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "Wasser" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "Fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "Nuklear" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "Kohle" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "Photovoltaik" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "Gas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Umspannwerk" @@ -18395,10 +19874,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Umspannwerk bearbeiten" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Trafostation" @@ -18407,5 +19886,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Trafostation bearbeiten" @@ -18413,10 +19892,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 "Liniennummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Strommast" @@ -18427,5 +19906,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 "Strommast bearbeiten" @@ -18433,5 +19912,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Stromleitung" @@ -18440,46 +19919,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Stromleitung bearbeiten" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Spannung" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Leitungsanzahl" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Einrichtungen" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toiletten" -#. 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 "Referenznummer" - #. 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 "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Briefkasten" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -18488,5 +19961,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Telefon bearbeiten" @@ -18494,5 +19967,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 "Münzen" @@ -18500,5 +19973,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 "Scheine" @@ -18506,5 +19979,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 "Geld- oder Prepaidkarten" @@ -18512,5 +19985,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 "Konto- oder EC-Karten" @@ -18518,15 +19991,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 "Kreditkarten" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonkarten" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recyclingstelle & -container" @@ -18535,5 +20008,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Recyclingstelle oder -container bearbeiten" @@ -18541,80 +20014,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterien" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Dosen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Kleidung" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Altmetall" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Bank" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Jagdanstand" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Jagdanstand bearbeiten" -#. 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 "Höhe" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "niedrig" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "halb" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "voll" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Versteck" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Schloß" -#. 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 "Höhe" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "niedrig" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "halb" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "voll" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Springbrunnen" @@ -18623,10 +20092,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Springbrunnen bearbeiten" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Trinkwasser" @@ -18635,10 +20104,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Trinkwasserabgabe bearbeiten" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Babyklappe" @@ -18646,25 +20115,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Babyklappe bearbeiten" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Geschäfte" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarkt" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Supermarkt bearbeiten" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Ferienhaus" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Ferienhaus bearbeiten" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Tante-Emma-Laden" @@ -18672,10 +20151,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Tante-Emma-Laden bearbeiten" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18683,10 +20161,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Kiosk bearbeiten" -#. 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 "Bushaltestelle bearbeiten" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Baum bearbeiten" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Verkaufsautomat" @@ -18694,5 +20191,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Automaten bearbeiten" @@ -18700,88 +20197,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Automatenprodukte" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "Fahrscheine" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "Pläne des öffentlichen Nahverkehrs" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "Parkscheine" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "Essen" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "Getränke" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "Süßigkeiten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "Zigaretten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "Fotos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "Tiernahrung" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "Zeitungen" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "Spielzeug" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "Briefmarken" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-Karten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "Telefonkarten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "Karten/Belege" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "Kondome" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "Tampons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "Hundekot-Tüten" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Kundenkarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Fleischer" @@ -18789,10 +20286,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Fleischer bearbeiten" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Bäcker" @@ -18800,10 +20296,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Bäcker bearbeiten" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Blumenladen" @@ -18811,20 +20306,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Blumenladen bearbeiten" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Bioladen" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Bioladen bearbeiten" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Spirituosen" @@ -18832,60 +20325,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Spirituosengeschäft bearbeiten" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Getränke" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Getränkeladen bearbeiten" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Computergeschäft bearbeiten" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronikgeschäft" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Elektronikgeschäft bearbeiten" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Hifi-Geschäft bearbeiten" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Mobiliar" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Möbelgeschäft bearbeiten" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Gartenzentrum" @@ -18893,10 +20380,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Gartenzentrum bearbeiten" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Haushaltswaren" @@ -18904,10 +20390,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Haushaltswaren bearbeiten" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Heimwerkerbedarf" @@ -18915,60 +20400,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Geschäft für Heimwerkerbedarf bearbeiten" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Bürobedarf" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Bürobedarf bearbeiten" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Friseur" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Friseur bearbeiten" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Schuhe" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Schuhladen bearbeiten" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Spielzeug" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Spielzeuggeschäft bearbeiten" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Videoverleih" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Videogeschäft bearbeiten" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Chemische Reinigung" @@ -18976,10 +20455,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Chemische Reinigung bearbeiten" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Waschsalon" @@ -18987,10 +20465,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Waschsalon bearbeiten" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Camping (Outdoor)" @@ -18998,35 +20475,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sport" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Sportgeschäft bearbeiten" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Optiker bearbeiten" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Geld" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -19034,16 +20508,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Bank bearbeiten" -#. 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 "Geldautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Wechselstube" @@ -19051,5 +20523,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Wechselstube bearbeiten" @@ -19057,15 +20529,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Geldautomat bearbeiten" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Gesundheit" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Arzt" @@ -19073,20 +20545,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Arzt bearbeiten" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Zahnarzt" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Zahnarzt bearbeiten" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apotheke" @@ -19094,5 +20564,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Apotheke bearbeiten" @@ -19100,10 +20570,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Rezepteinlösung" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Krankenhaus" @@ -19111,10 +20580,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Krankenhaus bearbeiten" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Notfallrettungspunkt" @@ -19123,5 +20592,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Notfallrettungspunkt bearbeiten" @@ -19130,20 +20599,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Punktname" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Telefonnummer" #. 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 "(Internationale Nummer verwenden, z.B. +49-123-45678)" @@ -19151,5 +20620,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 "Tierarzt" @@ -19158,55 +20627,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Tierarzt bearbeiten" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Kontinent bearbeiten" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Staat" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Staat bearbeiten" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Bundesland" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Bundesland bearbeiten" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Region bearbeiten" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Landkreis" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Landkreis bearbeiten" @@ -19214,15 +20683,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Großstadt" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Großstadt bearbeiten" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Stadt" @@ -19230,10 +20699,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Stadt bearbeiten" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Stadtteil" @@ -19241,25 +20710,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Stadtteil bearbeiten" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Dorf" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Dorf bearbeiten" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Weiler" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Weiler bearbeiten" @@ -19267,5 +20736,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Unbewohnter Ort" @@ -19273,10 +20742,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Unbewohnten Ort bearbeiten" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Insel" @@ -19284,11 +20753,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Insel bearbeiten" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "links" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Ferienhaus bearbeiten" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Höhleneingang" @@ -19296,10 +20778,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Höhleneingang bearbeiten" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Bergspitze" @@ -19307,10 +20789,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Bergspitze bearbeiten" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Gletscher" @@ -19318,10 +20800,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Gletscher bearbeiten" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkan" @@ -19329,70 +20811,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Vulkan bearbeiten" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Staat" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Staatsgrenze bearbeiten" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Innerstaatlich" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Innerstaatliche Grenze bearbeiten" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Zivil" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Zivilrechtliche Grenze bearbeiten" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politisch" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Politische Grenze bearbeiten" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Nationalpark" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Nationalparkgrenze bearbeiten" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Landnutzung" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Baum" @@ -19401,15 +20883,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Baum bearbeiten" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanischer Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Naturwald" @@ -19418,5 +20900,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Naturwald bearbeiten" @@ -19424,17 +20906,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 "Nadelwald" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "Laubwald" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "Mischwald" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Forst" @@ -19443,14 +20925,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Forst bearbeiten" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Naturdenkmal & Reservat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Naturdenkmal oder Reservat bearbeiten" @@ -19458,25 +20940,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Geröll" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Geröll bearbeiten" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Buschland" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Buschland bearbeiten" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Gebirge" @@ -19484,10 +20966,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Gebirge bearbeiten" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Heide" @@ -19495,5 +20977,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Heide bearbeiten" @@ -19501,5 +20983,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Bauernhof" @@ -19508,45 +20990,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Bauernhof bearbeiten" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Ackerland" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Ackerland bearbeiten" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Wiese" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Wiese bearbeiten" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Weinberg" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Weinberg bearbeiten" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Schrebergärten" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Schrebergärten bearbeiten" @@ -19554,25 +21036,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Garten" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Garten bearbeiten" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Gras" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Grasfläche bearbeiten" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Dorfanger" @@ -19580,10 +21062,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Dorfanger bearbeiten" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Öffentlicher Bereich" @@ -19591,20 +21073,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Öffentlichen Bereich bearbeiten" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Park bearbeiten" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Erholungsgebiet" @@ -19612,5 +21094,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Erholungsgebiet bearbeiten" @@ -19618,15 +21100,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Wohngebiet" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Wohngebiet bearbeiten" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Kleiner Friedhof" @@ -19634,9 +21116,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Kleinen Friedhof bearbeiten" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Friedhof" @@ -19644,39 +21126,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Friedhof bearbeiten" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Einkaufsbereich" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Einkaufsbereich bearbeiten" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Gewerbegebiet" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Gewerbegebiet bearbeiten" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industrie" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Industriegebiet bearbeiten" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Eisenbahngelände" @@ -19684,15 +21166,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Eisenbahngelände bearbeiten" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militärgebiet" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Militärgebiet bearbeiten" @@ -19700,55 +21182,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Baustellengebiet" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Baustelle bearbeiten" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Baulücke" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Baulücke bearbeiten" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Bauland" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Bauland bearbeiten" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Deponie" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Deponie bearbeiten" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Steinbruch" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Steinbruch bearbeiten" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19758,5 +21240,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 "Ein Multipolygon bearbeiten" @@ -19765,10 +21247,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "Äußeres Segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "Inneres Segment" @@ -19776,5 +21258,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Abbiegeeinschränkung" @@ -19783,5 +21265,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Abbiegeeinschränkung bearbeiten" @@ -19789,34 +21271,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Einschränkung" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "Nicht links abbiegen" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "Nicht rechts abbiegen" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "Nicht geradeaus" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "Wendeverbot" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "Nur rechts abbiegen" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "Nur links abbiegen" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "Nur geradeaus" @@ -19825,15 +21307,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "Von Weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "Über Knoten oder Weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "Zu Weg" @@ -19841,5 +21323,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Route" @@ -19848,5 +21330,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Route bearbeiten" @@ -19854,5 +21336,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Routentyp" @@ -19924,5 +21406,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 @@ -19931,17 +21413,17 @@ msgstr "Fahrrad" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "Bus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "Straße" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "Fähre" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "Ski" @@ -19994,5 +21476,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 @@ -20001,13 +21483,13 @@ msgstr "Fuß" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "Wandern" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "Straßenbahn" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "Umleitung" @@ -20021,10 +21503,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "U-Bahn" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Symbolbeschreibung" @@ -20032,31 +21514,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Netzwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "Route state" msgstr "Routenstatus" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "proposed" msgstr "geplant" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporär" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "Verbindung" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Farbe (hex)" @@ -20065,30 +21547,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "Routenabschnitt" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "Vorwärts-Abschnitt" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "Rückwärts-Abschnitt" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "Haltepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "Vorwärts-Haltepunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "Rückwärts-Haltepunkt" @@ -20526,11 +22008,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 "veraltet" @@ -20856,41 +22338,4 @@ msgid "motorroad" msgstr "Autostraße" - -#. 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 "Straße" #. color street @@ -22591,5 +24036,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 "Wasser (hell)" @@ -23188,55 +24633,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23250,5 +24646,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 "Tourismus" @@ -23320,8 +24716,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 "Historisch" @@ -23392,8 +24788,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 "Grün" @@ -23407,5 +24803,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "Steinbruch" @@ -23419,5 +24815,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "Mülldeponie" @@ -23439,5 +24835,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "Wasserbecken" @@ -23451,5 +24847,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "Forst" @@ -23463,5 +24859,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "Farmland" @@ -23484,5 +24880,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "Einkaufsbereich" @@ -23496,5 +24892,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "Industriegebiet" @@ -23508,5 +24904,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "Baulücke" @@ -23520,5 +24916,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "Bauland" @@ -23532,5 +24928,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "Eisenbahnland" @@ -23587,7 +24983,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 "Militär" @@ -23601,5 +24997,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "Friedhof" @@ -23612,5 +25008,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "Berggipfel" @@ -23625,5 +25021,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "Gletscher" @@ -23637,5 +25033,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "Vulkan" @@ -23690,8 +25086,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 "Natur" @@ -23705,5 +25101,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "Buschland" @@ -23717,20 +25113,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "Heide" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "Naturwald" - #. color water #. 1 @@ -23741,5 +25125,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "Schlick & Moor" @@ -23753,5 +25137,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "Strand" @@ -23829,8 +25213,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 "Route" @@ -23878,7 +25262,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 "Grenze" @@ -24020,10 +25404,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 "Ort" @@ -24071,6 +25464,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 "Adresse" @@ -24367,4 +25760,179 @@ msgstr "Terraserver Urban" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +#~ "Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions " +#~ "for no layer.\"" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." + +#~ msgid "Change {0} {1}" +#~ msgstr "{0} {1} ändern" + +#~ msgid "Delete {1} {0}" +#~ msgstr "{1} {0} löschen" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Relationselement {0} {1} entfernen" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}" + +#~ msgid "nodes" +#~ msgstr "Knotenpunkte" + +#~ msgid "ways" +#~ msgstr "Wege" + +#~ msgid "relations" +#~ msgstr "Relationen" + +#~ msgid "changesets" +#~ msgstr "Änderungsätze" + +#~ msgid "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" +#~ msgstr "" +#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +#~ "Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" +#~ msgstr "" +#~ "Warnung: \"Bitte-Warten\"-Dialog konnte nicht in den Vordergrund gebracht " +#~ "werden. Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" +#~ msgstr "" +#~ "Warnung: Dialog für das Auflösen von Konflikten konnte nicht in den " +#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Das Laden der Historie vom Server ist fehlgeschlagen. Details:
" +#~ "{0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem " +#~ "löschen?" + +#~ msgid "Delete Layer" +#~ msgstr "Ebene löschen" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?" + +#~ msgid "Delete all" +#~ msgstr "Alle löschen" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Lösche Ebene {0} von {1}" + +#~ msgid "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog für das Editieren von Eigenschaften konnte nicht in den " +#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" + +#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +#~ "Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +#~ "Fehlermeldung ist: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autoren: {0}" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die " +#~ "Ausnahme war: {0}" + +#~ msgid "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog für die Geschichte von Elementen konnte nicht in den " +#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" +#~ msgstr "" +#~ "Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem " +#~ "timeout durch den Server geschlossen. Die Fehlermeldung war: {1}" + +#~ msgid "Public" +#~ msgstr "Öffentlich" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Lambertkoordinaten eingeben" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie " +#~ "vorm Hochladen alles." + +#~ msgid "Continue anyway" +#~ msgstr "Trotzdem fortfahren" + +#~ msgid "Copy Default" +#~ msgstr "Standard kopieren" + +#~ msgid "Edit Information Office" +#~ msgstr "Informationsbüro bearbeiten" + +#~ msgid "Map Type" +#~ msgstr "Kartentyp" + +#~ msgid "map" +#~ msgstr "Karte" + +#~ msgid "citymap" +#~ msgstr "Stadtplan" + +#~ msgid "hikingmap" +#~ msgstr "Wanderkarte" + +#~ msgid "bicyclemap" +#~ msgstr "Fahrradkarte" + +#~ msgid "Board Type" +#~ msgstr "Tafeltyp" + +#~ msgid "board" +#~ msgstr "Infotafel" + #~ msgid "Select Tableau d'Assemblage" #~ msgstr "Montagetabelle wählen" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 17484) +++ /applications/editors/josm/i18n/po/el.po (revision 17485) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" "PO-Revision-Date: 2009-07-09 11:26+0000\n" "Last-Translator: alichani \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Δημιουργία κύριου GUI" #. 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 "" -#: ../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 @@ -96,156 +99,160 @@ #: ../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] "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;" + +#: ../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 "Αγνοήθηκε κακοσχηματισμένο URL:\"{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 "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -270,7 +277,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" @@ -308,5 +316,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" @@ -330,6 +338,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 "Πρόσθετα" @@ -346,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -361,5 +376,5 @@ msgstr "" -#: ../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 "" @@ -369,11 +384,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -382,5 +397,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 "" @@ -397,11 +412,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 @@ -430,5 +445,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 "Γεωγραφικό πλάτος" @@ -437,30 +452,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 @@ -474,6 +489,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 @@ -481,58 +496,57 @@ 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 "" @@ -543,10 +557,10 @@ "{0}, μέγιστος είναι {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 "" @@ -555,5 +569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -562,46 +576,46 @@ msgstr "" -#: ../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 "" -#: ../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 @@ -611,22 +625,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 "" @@ -637,4 +651,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 " @@ -642,17 +660,7 @@ msgstr "" -#: ../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 @@ -660,27 +668,32 @@ 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 "" -#: ../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 " @@ -688,32 +701,32 @@ msgstr "" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -723,20 +736,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 "Διαγραφή" @@ -746,86 +759,87 @@ 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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -834,6 +848,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 "Αντιγραφή" @@ -857,86 +871,92 @@ 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 "" -#: ../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 "" -#: ../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 +#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -988,22 +1008,26 @@ 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 " @@ -1013,77 +1037,73 @@ "συγχωνεύσετε;" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου." @@ -1091,5 +1111,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 "Νέα" @@ -1099,17 +1119,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 "" +#: ../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 @@ -1147,13 +1172,13 @@ msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες" -#: ../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 "" @@ -1161,9 +1186,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 " @@ -1172,9 +1193,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 "Ορθογωνισμός" @@ -1190,13 +1211,26 @@ 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}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1222,37 +1256,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 "" +#: ../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 "" @@ -1260,10 +1289,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 "Αποθήκευση τεχόντων δεδομένων." @@ -1274,37 +1304,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 " @@ -1312,28 +1330,28 @@ msgstr "" -#: ../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 "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." @@ -1366,33 +1384,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." @@ -1400,5 +1418,5 @@ msgstr[1] "" -#: ../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 " @@ -1414,9 +1432,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." @@ -1424,10 +1442,10 @@ msgstr[1] "" -#: ../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 " @@ -1435,5 +1453,5 @@ msgstr "" -#: ../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 " @@ -1441,5 +1459,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 " @@ -1447,8 +1465,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 "" + +#: ../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 @@ -1466,51 +1509,51 @@ msgstr "" +#: ../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" +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: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 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1519,5 +1562,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" @@ -1527,9 +1570,9 @@ msgstr "" -#: ../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" @@ -1537,5 +1580,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" @@ -1581,61 +1624,71 @@ "λήψη δεδομένων)" -#: ../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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "" @@ -1649,17 +1702,17 @@ msgstr "" -#: ../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 "" @@ -1670,5 +1723,5 @@ msgstr "" -#: ../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}\"" @@ -1677,27 +1730,64 @@ "αναμενόμενο πρότυπο \"{1}\"" -#: ../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 "" -#: ../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 "" -#: ../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 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 +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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1705,31 +1795,79 @@ 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 +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] "Αντικείμενα που θα προστεθούν:" + +#: ../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] "Αντικείμενα που θα αλλαχτούν" + +#: ../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] "Αντικείμενα που θα διαγραφούν:" + +#: ../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 @@ -1753,20 +1891,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 "Γρηγορότερα μπροστά" @@ -1808,10 +1946,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 "Πιο αργά μπροστά" @@ -1839,31 +1977,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 "" @@ -1875,20 +2009,20 @@ msgstr "" -#: ../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 @@ -1897,5 +2031,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 " @@ -1903,55 +2037,69 @@ msgstr "" -#: ../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 "" +#: ../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 @@ -1959,38 +2107,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." @@ -1999,14 +2147,14 @@ msgstr[1] "" -#: ../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 "Τέλος σχεδιασμού." @@ -2026,5 +2174,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 "" @@ -2039,5 +2187,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 "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή" @@ -2053,17 +2201,18 @@ msgstr "" +#: ../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" @@ -2072,25 +2221,29 @@ msgstr[1] "" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." @@ -2099,5 +2252,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-" @@ -2122,62 +2275,62 @@ "+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" +#: ../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:77 +msgid "case sensitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 msgid "regular expression" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java: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:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' οπουδήποτε στο όνομα." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2185,109 +2338,109 @@ msgstr "" -#: ../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: - κλειδί=foot ορισμένο με οποιαδήποτε τιμή." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +msgid "Special targets:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "modified - all changed objects" msgstr "modified - όλα τα αλλαγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../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 "untagged - όλα τα αντικείμενα χωρίς ετικέτες" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/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" @@ -2348,58 +2501,96 @@ msgstr "" -#: ../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 "Αδυναμία ανάγνωσης από το URL: \"{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 "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../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 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../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} αντικειμένου" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Τελεταία αλλαγή στις {0}" + +#: ../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" @@ -2408,10 +2599,10 @@ msgstr[1] "αντικείμενα" -#: ../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}" @@ -2423,5 +2614,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2430,10 +2621,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2442,5 +2633,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}''" @@ -2464,44 +2655,60 @@ 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}" + +#: ../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] "Κατάσταση Διαγραφής" + +#: ../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}" + +#: ../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] "Διαγραφή από σχέση" + +#: ../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 "" @@ -2509,6 +2716,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." @@ -2520,5 +2727,5 @@ "μπορεί να τους χρησιμοποιούν.
Είστε σίγουροι οτι επιθυμείτε διαγραφή;" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2529,5 +2736,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2562,10 +2769,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2578,18 +2795,38 @@ msgstr "Ακολουθία" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../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 "Επίλυση συγκρούσεων" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Αφαίρεση αναφοράς από την σχέση {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2613,13 +2850,13 @@ msgstr "" -#: ../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 "Νέος ρόλος" @@ -2638,64 +2875,121 @@ #: ../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 "" -#: ../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 "" @@ -2709,29 +3003,36 @@ msgstr "" -#: ../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}" @@ -2743,15 +3044,229 @@ msgstr "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "Οδός \"από\" δεν βρέθηκε." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "" + +#: ../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" @@ -2760,22 +3275,7 @@ msgstr[1] "κόμβοι" -#: ../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" @@ -2784,12 +3284,7 @@ msgstr[1] "" -#: ../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" @@ -2798,246 +3293,4 @@ msgstr[1] "σχέσεις" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} μέλος" -msgstr[1] "{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} κόμβοι" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "Οδός \"από\" δεν βρέθηκε." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "" - -#: ../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" @@ -3050,5 +3303,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "φόντο" @@ -3058,5 +3311,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3066,5 +3319,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3080,21 +3333,21 @@ "και ξεκινήστε νέο επίπεδο στην νέα ζώνη." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Ζώνη Labert (Γαλλία)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../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:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Μερκατορικός" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Ελβετικό πλέγμα (Ελβετία)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3115,8 +3368,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3124,15 +3377,101 @@ #: ../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/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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "" + +#: ../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} κόμβοι" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} μέλος" +msgstr[1] "{0} μέλη" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "" @@ -3142,36 +3481,9 @@ msgstr "" -#: ../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 "" @@ -3181,9 +3493,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 "" @@ -3192,9 +3504,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3203,9 +3515,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 "" @@ -3215,9 +3538,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 "" @@ -3227,11 +3550,6 @@ msgstr "" -#: ../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 "" @@ -3249,38 +3567,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 "" -#: ../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 " @@ -3290,5 +3608,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 " @@ -3296,5 +3614,5 @@ msgstr "" -#: ../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 " @@ -3302,75 +3620,94 @@ msgstr "" -#: ../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 "" -#: ../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 "Λήψη της τοποθεσίας στο URL (με 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 "" -#: ../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" @@ -3381,48 +3718,48 @@ "ότι φορτώσατε δεδομένα πριν το --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." msgstr "" -#: ../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 @@ -3434,21 +3771,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 "Ήχος" @@ -3488,58 +3825,44 @@ 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:97 +msgid "The angle between the previous and the current way segment." +msgstr "" + +#: ../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:99 -msgid "The angle between the previous and the current way segment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 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 "" - -#: ../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 "" @@ -3551,10 +3874,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 "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3613,7 +3930,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" @@ -3629,5 +3945,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" @@ -3730,5 +4046,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 "Η έκδοση μου" @@ -3739,5 +4055,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" @@ -3751,5 +4067,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 "Η έκδοση τους" @@ -3826,6 +4142,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" @@ -3936,10 +4252,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 "" @@ -3948,19 +4264,19 @@ msgstr "" -#: ../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 "" @@ -3969,5 +4285,5 @@ msgstr "" -#: ../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 "" @@ -3985,9 +4301,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 " @@ -3995,110 +4311,112 @@ 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 "" -#: ../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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 msgid "Reset id to 0" msgstr "" -#: ../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 "" @@ -4107,21 +4425,21 @@ msgstr "" -#: ../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 "" @@ -4160,10 +4478,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 @@ -4172,10 +4491,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 @@ -4189,5 +4509,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}" @@ -4228,4 +4548,139 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 +#, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 +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] "" +msgstr[1] "" + +#: ../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} σχέσεις" + +#: ../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} τροχιές, " #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4241,10 +4696,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 @@ -4252,5 +4707,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}" @@ -4283,36 +4738,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 "" @@ -4324,152 +4773,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 "" -#: ../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 "" - -#: ../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 "" - -#: ../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." @@ -4478,28 +4893,22 @@ msgstr[1] "Αυτό θα αλλάξει εώς {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" @@ -4508,90 +4917,85 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {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 "Διαγραφή Ιδιοτήτων" @@ -4600,34 +5004,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 "" @@ -4660,23 +5064,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] "" -msgstr[1] "" - -#: ../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} σχέσεις" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4684,14 +5074,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." @@ -4700,65 +5085,98 @@ "αριστερή εργαλειοθήκη." -#: ../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] "Συγγραφέας" + +#: ../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 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "" @@ -4767,47 +5185,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 " @@ -4816,14 +5228,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 "" @@ -4833,9 +5245,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 "" @@ -4845,15 +5257,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4861,5 +5273,5 @@ msgstr "" -#: ../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 " @@ -4867,20 +5279,20 @@ msgstr "" -#: ../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 "" @@ -4889,57 +5301,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 " @@ -4948,9 +5360,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 "" @@ -4959,20 +5371,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 @@ -4982,37 +5390,37 @@ msgstr "Εντάξει" -#: ../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 "" @@ -5022,30 +5430,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 "" @@ -5059,22 +5467,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 "" @@ -5107,34 +5520,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] "" -msgstr[1] "" - -#: ../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 "Επιλέξτε ένα σελιδοδείκτη πρώτα." @@ -5193,13 +5593,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 "" @@ -5207,18 +5607,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 "όνομα" @@ -5257,37 +5656,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: " @@ -5296,5 +5695,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 "Slippy map" @@ -5321,47 +5720,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 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Φόρτωση ιστορικού" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Φόρτωση ιστορικού" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Αφαίρεση αναφοράς από την σχέση {0}" #. item "Streets/Motorway" text "Reference" @@ -5679,14 +6106,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5862,8 +6303,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" #. @@ -5960,4 +6407,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6071,6 +6521,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 @@ -6078,153 +6528,171 @@ #: 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 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../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 @@ -6233,32 +6701,286 @@ 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 +#, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "" + +#: ../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] "" + +#: ../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] "" + +#: ../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] "" + +#: ../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 +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 @@ -6266,29 +6988,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" @@ -6297,14 +7019,14 @@ msgstr[1] "εικόνες" -#: ../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 @@ -6312,82 +7034,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 "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" -#: ../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" @@ -6447,5 +7169,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}" @@ -6461,10 +7183,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." @@ -6475,11 +7197,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 @@ -6521,4 +7243,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." @@ -6538,64 +7265,64 @@ msgstr "" -#: ../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 "" -#: ../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" @@ -6603,5 +7330,5 @@ msgstr[1] "ίχνη" -#: ../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" @@ -6609,5 +7336,5 @@ msgstr[1] "σημεία" -#: ../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" @@ -6616,5 +7343,5 @@ msgstr[1] "ένα ίχνος με {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" @@ -6623,5 +7350,5 @@ msgstr[1] "το {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" @@ -6630,9 +7357,9 @@ msgstr[1] "{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" @@ -6640,5 +7367,5 @@ msgstr[1] "σημάδια" -#: ../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" @@ -6659,5 +7386,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}." @@ -6665,5 +7392,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 "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται." @@ -6692,5 +7419,5 @@ "Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών." -#: ../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 " @@ -6698,5 +7425,5 @@ msgstr "" -#: ../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 " @@ -6704,30 +7431,30 @@ msgstr "" -#: ../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: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:44 -msgid "There was an error while trying to display the URL for this marker" -msgstr "" -"Παρουσιάστηκε σφάλμα κατά την προσπάθεια προβολής URL για αυτό το σημάδι" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "Το URL ήταν: " -#: ../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 @@ -6735,14 +7462,14 @@ 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 "" @@ -6750,13 +7477,13 @@ "χρησιμοποιηθεί ακόμα)." -#: ../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 @@ -6764,14 +7491,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 "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής" @@ -6896,40 +7623,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 "" -#: ../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 "Χρώματα" @@ -6973,5 +7700,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Αυτοκίνητο" @@ -6993,16 +7720,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:" #. @@ -7032,12 +7760,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 "Πεζοί" @@ -7212,5 +7940,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 "Εμφάνιση οθόνης έναρξης στην εκκίνηση" @@ -7218,23 +7946,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 "" -#: ../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 "" -#: ../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 "Όψη και Αίσθηση" @@ -7266,54 +8005,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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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 "Επεξεργασία URL περιγραφής πρόσθετου του 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 " @@ -7322,41 +8061,41 @@ "Διάφορες ρυθμίσεις που επηρρεάζουν την εμφάνιση ολόκληρου του προγράμματος." -#: ../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 "Προβολή Χάρτη" @@ -7389,12 +8128,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 "Η βασική URL για τον διακομιστή OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Η βασική URL για τον διακομιστή" #. 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 @@ -7421,61 +8152,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7644,36 +8374,59 @@ 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] "" +msgstr[1] "" + +#: ../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 @@ -7681,15 +8434,15 @@ msgstr "" -#: ../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 @@ -7699,22 +8452,22 @@ msgstr[1] "Αλλαγή {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}''" @@ -7753,11 +8506,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 " @@ -7767,38 +8520,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 "Αρχεία GPX" -#: ../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 "Copyright (URL)" -#: ../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 "Έτος Copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Λέξεις κλειδιά" @@ -7808,9 +8561,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 "" @@ -7821,10 +8574,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 @@ -7834,12 +8587,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" @@ -7860,6 +8613,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 @@ -7869,20 +8622,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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 " @@ -7890,34 +8663,34 @@ msgstr "" -#: ../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!" @@ -7928,9 +8701,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7939,15 +8712,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7955,33 +8728,91 @@ msgstr "" -#: ../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}." @@ -8009,29 +8840,33 @@ msgstr "" -#: ../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 "Η βασική URL για τον διακομιστή OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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." @@ -8040,13 +8875,17 @@ "κωδικός." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Η βασική URL για τον διακομιστή" + +#: ../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." @@ -8055,20 +8894,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Αρχεία Διακομιστή OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8077,5 +8916,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8270,35 +9109,46 @@ "Internet." -#: ../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 "" @@ -8311,5 +9161,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." @@ -8319,23 +9169,23 @@ "{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:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Απαιτείται η έκδοση {0} του JOSM για το πρόσθετο {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 "Παράλειψη Λήψης" @@ -8346,30 +9196,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 "" -#: ../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 " @@ -8380,22 +9230,22 @@ "διαμόρφωση.)" -#: ../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:176 +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" +msgstr "" +"Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" + #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" -"Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 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 " @@ -8405,5 +9255,5 @@ "άδεια αντικατάστασης των υπαρχόντων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8413,10 +9263,10 @@ "''{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." @@ -8425,9 +9275,9 @@ "κάντε αναφορά για bug." -#: ../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 " @@ -8437,13 +9287,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" @@ -8454,5 +9304,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" @@ -8461,18 +9311,18 @@ msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {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 "" -#: ../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 "" @@ -8485,9 +9335,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 "" @@ -8500,35 +9350,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 "Αναφέρετε Bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8543,19 +9393,19 @@ "για bug." -#: ../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:69 +msgid "Include your steps to get to the error (as detailed as possible)!" +msgstr "" +"Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!" + #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 -msgid "Include your steps to get to the error (as detailed as possible)!" -msgstr "" -"Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8565,19 +9415,19 @@ "πρόσθετων πριν αναφέρετε bug." -#: ../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 "" -#: ../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 "" @@ -8586,5 +9436,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8593,5 +9443,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8605,5 +9455,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" @@ -8613,5 +9463,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8622,17 +9472,17 @@ "\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 "" @@ -8641,4 +9491,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8663,9 +9548,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 @@ -8673,27 +9576,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" +#: ../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}" @@ -8701,47 +9617,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 "" -#: ../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" @@ -8854,19 +9770,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 "" -#: ../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." @@ -8875,34 +9791,34 @@ msgstr "" -#: ../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" @@ -8910,29 +9826,29 @@ msgstr "" -#: ../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 "" -#: ../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 "" @@ -8940,41 +9856,41 @@ "βοηθήσει;" -#: ../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 "" -#: ../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 "" @@ -8983,9 +9899,9 @@ msgstr "" -#: ../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 "" @@ -8994,65 +9910,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../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." msgstr "" -#: ../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 "" -#: ../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 " @@ -9060,13 +9976,13 @@ msgstr "" -#: ../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 "" @@ -9087,5 +10003,5 @@ msgstr "Σφάλμα στο αρχείο {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9098,12 +10014,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 "Σφάλμα φόρτωσης αρχείου" @@ -9134,6 +10049,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9142,21 +10057,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" @@ -9165,37 +10080,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." @@ -9207,18 +10133,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9228,5 +10154,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). " @@ -9234,40 +10160,40 @@ msgstr "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9324,12 +10250,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Επικοινωνία με διακομιστή WMS..." +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 @@ -9363,20 +10287,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" @@ -9384,9 +10308,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" @@ -9394,30 +10324,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "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 @@ -9480,6 +10419,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)" @@ -9503,6 +10442,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 "Άδειο επίπεδο" @@ -9518,7 +10457,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 @@ -10038,6 +10977,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 "νερό" @@ -10050,8 +10989,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 @@ -10344,9 +11279,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 "" -#: ../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 " @@ -10355,5 +11290,5 @@ msgstr "" -#: ../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 "" @@ -10918,5 +11853,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 "Όνομα οδού" @@ -10935,29 +11870,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 "Συγνώμη, δεν δουλεύει για ανόνυμους χρήστες" @@ -10971,23 +11906,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 "" -#: ../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" @@ -10996,38 +11923,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -11035,81 +11962,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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?" @@ -11119,25 +12046,25 @@ msgstr[1] "" -#: ../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 "" @@ -11226,53 +12153,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" @@ -11297,20 +12224,51 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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: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 +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 @@ -11393,23 +12351,23 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -11420,7 +12378,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 "" @@ -11428,80 +12386,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 "" -#: ../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:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11509,82 +12467,82 @@ msgstr "" -#: ../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 "" -#: ../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 "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)" -#: ../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 "" -#: ../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}''" @@ -11729,7 +12687,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 "κτίριο" @@ -11743,5 +12701,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 "" @@ -11877,5 +12835,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Δημιοθργήθηκε εξαίρεση" @@ -11920,14 +12878,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}" @@ -11938,26 +12896,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 "" -#: ../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 " @@ -11965,37 +12923,55 @@ msgstr "" -#: ../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 "" -#: ../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 "" @@ -12008,15 +12984,42 @@ 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 +msgid "(deactivated)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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" @@ -12024,58 +13027,58 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../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}" msgstr "Μη υποστηριζόμενη έκδοση αρχείου 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 "" @@ -12083,32 +13086,43 @@ "πρόσθετου 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 URL" -#: ../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 "Εισάγετε ένα όνομα μενού και ένα WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Αντιγραφή Προξαθορισμένου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12471,62 +13485,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" @@ -12541,5 +13500,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 "Λωρίδες κυκλοφορίας" @@ -12554,5 +13513,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" @@ -12562,10 +13520,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 "Μεγ. Ταχύτητα (χαω)" @@ -12609,9 +13567,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 "Μονόδρομος" @@ -12659,13 +13617,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 "Γέφυρα" @@ -12707,13 +13665,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 "Σήραγγα" @@ -12753,12 +13711,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 "" @@ -12798,12 +13756,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 "" @@ -12959,17 +13917,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 "Πλάτος (μέτρα)" @@ -12996,4 +13954,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" @@ -13012,11 +13971,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 "Επιφάνεια" @@ -13026,4 +13986,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" @@ -13038,9 +13999,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 "" @@ -13048,10 +14010,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" @@ -13059,11 +14084,93 @@ #: 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 "" @@ -13145,20 +14252,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 "Αδιέξοδο" @@ -13171,8 +14278,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 "Πρόσβαση" @@ -13207,32 +14314,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 "ναι" @@ -13245,40 +14367,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 "" @@ -13291,19 +14413,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 "προορισμός" @@ -13326,65 +14448,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13399,10 +14526,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 "Άλογο" @@ -13418,17 +14545,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" @@ -13440,30 +14566,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 "Ελαχ. ταχύτητα (χαω)" @@ -13471,25 +14597,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 "Κυκλικός κόμβος" @@ -13500,5 +14626,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 "" @@ -13514,5 +14640,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" #. @@ -13520,9 +14646,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 "Τύπος" @@ -13542,10 +14668,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 "" @@ -13567,10 +14693,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 "" @@ -13592,10 +14718,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 "" @@ -13617,5 +14743,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" @@ -13630,9 +14756,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 "αταξινόμητος" @@ -13646,9 +14772,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 "" @@ -13678,10 +14804,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 "" @@ -13711,6 +14837,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 "" @@ -13721,10 +14847,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 "Σήραγγα" @@ -13732,19 +14858,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 "Κόμβος" @@ -13760,5 +14886,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "κυκλικός κόμβος" @@ -13767,5 +14893,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13773,5 +14899,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13779,5 +14905,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Ποδηλατόδρομος" @@ -13787,11 +14913,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 "" @@ -13800,11 +14932,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 "Πεζόδρομος" @@ -13813,5 +14951,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Επεξεργασία Πεοζόδρομου" @@ -13819,5 +14957,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Σκαλοπάτια" @@ -13827,5 +14965,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 "Επεξεργασία σκαλοπατιών" @@ -13834,5 +14972,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13841,39 +14979,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 "" @@ -13882,5 +14992,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13888,5 +14998,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13895,5 +15005,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13901,5 +15011,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13908,5 +15018,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13914,5 +15024,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13921,5 +15031,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13927,5 +15037,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13934,5 +15044,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13941,5 +15051,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Μονοπάτι" @@ -13948,19 +15058,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 "Snowmobile" -#: 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 "Πεζοπορία" @@ -13970,5 +15083,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 "Επεξεργασία Πεζοπορίας" @@ -13976,5 +15089,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Ορειβασία" @@ -13984,5 +15097,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 "Επεξεργασία Ορειβασίας" @@ -13990,5 +15103,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Απαιτητική Ορειβασία" @@ -13998,5 +15111,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 "Επεξεργασία απαιτητικής ορειβασίας" @@ -14004,5 +15117,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -14012,5 +15125,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 "" @@ -14018,5 +15131,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -14026,5 +15139,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 "" @@ -14032,5 +15145,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -14040,5 +15153,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 "" @@ -14046,10 +15159,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 "Κόμβος Αυτοκινητοδρόμου" @@ -14057,15 +15170,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 "Υπηρεσίες" @@ -14073,5 +15186,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -14085,4 +15198,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" #. @@ -14102,18 +15217,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 "Λειτουργός" @@ -14122,5 +15239,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Σηματοδότης" @@ -14130,5 +15247,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Τύπος διάβασης πεζών" @@ -14137,27 +15254,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 "" @@ -14165,6 +15282,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 "" @@ -14173,11 +15290,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 "" @@ -14185,30 +15302,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 "Stop" @@ -14216,5 +15333,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Διάβαση Πεζών" @@ -14223,14 +15340,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Μικρός Κυκλικός Κόμβος" @@ -14241,14 +15358,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 "" @@ -14258,20 +15375,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 "Κάμερα ελέγχου ταχύτητας" @@ -14279,5 +15396,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Τηλέφωνο εκτάκτου ανάγκης" @@ -14285,5 +15402,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14291,5 +15408,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14298,10 +15415,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 "" @@ -14309,5 +15426,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14315,5 +15432,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14321,11 +15438,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 "Υψόμετρο" @@ -14333,5 +15450,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Εμπόδια" @@ -14339,5 +15456,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14345,5 +15462,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14388,16 +15505,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 "" @@ -14406,5 +15523,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14412,5 +15529,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14418,10 +15535,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 "" @@ -14429,15 +15546,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 "Σταθμός Διοδίων" @@ -14445,5 +15562,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Επεξεργασία Σταθμού Διοδίων" @@ -14451,10 +15568,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 "Επεξεργασία Συνοριακού Σταθμού" @@ -14464,5 +15581,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Φράκτης θάμνων" @@ -14471,5 +15588,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Φράκτης" @@ -14478,5 +15595,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Τοίχος" @@ -14484,5 +15601,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "" @@ -14491,5 +15608,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14501,15 +15618,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 "Πύλη" @@ -14517,50 +15634,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 "" @@ -14568,25 +15685,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 "" @@ -14597,10 +15714,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 "Πηγή" @@ -14608,5 +15725,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Επεξεργασία πηγής" @@ -14614,5 +15731,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14620,10 +15737,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 "Υδατόρρευμα" @@ -14631,10 +15748,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 "Κανάλι" @@ -14642,10 +15759,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 "Ποταμός" @@ -14655,5 +15772,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 "Επεξεργασία ποταμού" @@ -14661,15 +15778,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 "Επεξεργασία νερού" @@ -14677,15 +15794,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 "Ταμιευτήρας" @@ -14693,15 +15810,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 "Επεξεργασία Καλυμένου Ταμιευτήρα" @@ -14709,5 +15826,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Όχθη ποταμού" @@ -14716,10 +15833,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 "" @@ -14730,14 +15847,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 "" @@ -14751,35 +15868,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 "Παραλία" @@ -14787,20 +15904,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 "Λόφος" @@ -14808,10 +15925,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 "Ακτογραμμή" @@ -14819,5 +15936,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Επεξεργασία Ακτογραμμής" @@ -14825,5 +15942,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "" @@ -14831,5 +15948,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14838,5 +15955,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14844,10 +15961,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 "" @@ -14855,5 +15972,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14861,5 +15978,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Φράγμα" @@ -14867,15 +15984,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Επεξεργασία Φweirράγματος" #. 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 "" @@ -14884,5 +16001,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Φράγμα εκτροπής" @@ -14890,20 +16007,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 "" @@ -14912,15 +16029,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 "Αποβάθρα" @@ -14928,10 +16045,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 "" @@ -14939,10 +16056,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 "" @@ -14952,5 +16069,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 "" @@ -14958,10 +16075,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 "Σιδηροτροχιά" @@ -14969,5 +16086,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Επεξεργασία σιδηροτροχιάς" @@ -14997,8 +16114,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 "" @@ -15012,35 +16129,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 "" @@ -15048,45 +16165,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 "" @@ -15094,5 +16211,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15101,14 +16218,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 "" @@ -15117,5 +16234,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Ισόπεδη διάβαση" @@ -15124,5 +16241,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Φυλασόμενη Διάβαση" @@ -15132,5 +16249,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Είδος Διάβασης" @@ -15138,5 +16255,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Περιστρεφόμενη πλατφόρμα" @@ -15145,10 +16262,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 "" @@ -15156,10 +16273,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 "" @@ -15167,10 +16284,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 "" @@ -15178,10 +16295,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 "" @@ -15189,5 +16306,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15195,5 +16312,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 "Σταθμός" @@ -15204,10 +16321,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 "Καύσιμα" @@ -15217,9 +16334,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" @@ -15239,106 +16585,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 "Επεξεργασία Ενοικίασης ποδηλάτων" @@ -15347,15 +16728,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 "" @@ -15363,5 +16744,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15369,5 +16750,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15375,5 +16756,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Στάση Τραμ" @@ -15382,5 +16763,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Επεξεργασία Στάσης Τραμ" @@ -15388,5 +16769,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -15395,5 +16776,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -15405,5 +16786,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 "" @@ -15411,10 +16792,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 "Είσοδος υπογείου σιδηρόδρομου" @@ -15423,10 +16804,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 "Αναπηρικό καρότσι" @@ -15435,5 +16816,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Σταθμός Λεωφορείων" @@ -15442,5 +16823,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Επεξεργασία Σταθμού Λεωφορείων" @@ -15448,5 +16829,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Στάση Λεωφορείου" @@ -15456,5 +16837,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 "Επεξεργασία Στάσης Λεωφορείου" @@ -15463,8 +16844,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 "Καταφύγιο" @@ -15472,10 +16851,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 "" @@ -15483,5 +16862,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Ταξί" @@ -15489,5 +16868,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Επεξεργασία σταθμού ταξί" @@ -15495,5 +16874,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Αεροδρόμιο" @@ -15501,15 +16880,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15518,5 +16897,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Διαμονή" @@ -15528,5 +16907,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Ξενοδοχείο" @@ -15535,15 +16914,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 "" @@ -15551,20 +16930,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 "Σαλέ" @@ -15572,10 +16951,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 "" @@ -15583,30 +16962,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 "Χώρος Κάμπινγκ" @@ -15614,10 +16993,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 "Φαγητό+Ποτά" @@ -15628,5 +17007,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Εστιατόριο" @@ -15634,5 +17013,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Επεξεργασία Εστιατορίου" @@ -15640,5 +17019,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 "Κουζίνα" @@ -15646,61 +17025,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 "pizza" -#: 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 "Fast Food" @@ -15708,9 +17087,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Επεξεργασία Εστιατορίου Fast Food" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Καφέ" @@ -15718,10 +17097,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 "Pub" @@ -15729,20 +17107,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Επεξεργασία Pub" -#. 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 "Μπαρ" @@ -15750,10 +17126,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 "Νυχτερινό Κέντρο" @@ -15761,33 +17136,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 "Μουσείο" @@ -15795,10 +17161,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 "Ζωολογικός Κήπος" @@ -15807,10 +17172,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 "" @@ -15818,25 +17182,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 "" @@ -15844,5 +17207,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "" @@ -15850,86 +17213,210 @@ #. 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 "Stop" + +#. 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 "Πόλη" + +#: 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)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. 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 "" @@ -15937,25 +17424,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 "Κάστρο" @@ -15964,20 +17451,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 "Αρχαιολογικός Χώρος" @@ -15986,10 +17472,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 "Πεδίο Μάχης" @@ -15997,5 +17482,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Επεξεργασία Πεδίου Μάχης" @@ -16003,15 +17488,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 "Ηρώο" @@ -16019,45 +17504,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 "Παιδική Χαρά" @@ -16065,15 +17550,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 "Επεξεργασία Ψαρέματος" @@ -16081,15 +17566,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 "Επεξεργασία Σταδίου" @@ -16103,6 +17588,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 "επιλέξτε άθλημα:" @@ -16494,30 +17979,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 "άθληση" @@ -16527,227 +18012,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 "baseball" -#: 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 "cricket" -#: 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 "golf" -#: 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 "rugby" -#: 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 "Μίνι Golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Επεξεργασία Μίνι Golf" -#. 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 "" @@ -16786,248 +18269,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "Σκοποβολή" @@ -17035,178 +18510,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 "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Επεξεργασία Baseball" -#: 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 "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Επεξεργασία Golf" #. 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 "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Επεξεργασία Hockey" -#: 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 "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Επεξεργασία Rugby" -#: 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 "Κτήριο" @@ -17214,5 +18689,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Δημόσιο Κτήριο" @@ -17220,10 +18695,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 "Δημαρχείο" @@ -17231,10 +18706,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 "Πρεσβεία" @@ -17242,10 +18717,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 "Δικαστήρια" @@ -17254,10 +18729,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 "Φυλακή" @@ -17266,10 +18741,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 "Αστυνομία" @@ -17279,10 +18754,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 "Πυροσβεστείο" @@ -17291,10 +18766,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 "Ταχυδρομείο" @@ -17302,5 +18777,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Επεξεργασία Ταχυδρομείου" @@ -17308,15 +18783,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 "Σχολείο" @@ -17324,10 +18799,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 "Πανεπιστήμιο" @@ -17335,10 +18810,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 "Κολέγιο" @@ -17346,5 +18821,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Επεξεργασία Κολεγίου" @@ -17352,5 +18827,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Κινηματογράφος" @@ -17359,10 +18834,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 "Βιβλιοθήκη" @@ -17371,10 +18846,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 "Κέντρο Τεχνών" @@ -17382,10 +18856,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 "Θέατρο" @@ -17394,10 +18868,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 "Τόπος Λατρείας" @@ -17407,5 +18881,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 "Επεξεργασία Τόπου Λατρείας" @@ -17414,6 +18888,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 "Θρησκεία" @@ -17422,66 +18896,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 "Δόγμα" @@ -17490,81 +18964,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 "Διευθύνσεις" @@ -17573,5 +19047,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Επεξεργασία διεύθυνσης" @@ -17579,5 +19053,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Αριθμός σπιτιού" @@ -17585,20 +19059,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 "Κωδικός χώρας" @@ -17606,5 +19080,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Παρεμβολή Διευθύνσεων" @@ -17613,5 +19087,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων" @@ -17619,71 +19093,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 "Φάρος" @@ -17691,10 +19161,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 "Ανεμόμυλος" @@ -17702,10 +19172,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 "Αγωγός" @@ -17713,10 +19183,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 "Βιολογικός Καθαρισμός" @@ -17726,10 +19196,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 "Γερανός" @@ -17737,10 +19207,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 "Φάρος" @@ -17748,10 +19218,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 "" @@ -17759,10 +19229,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 "Παρακολούθηση" @@ -17770,5 +19240,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Επεξεργασία Κάμερας Παρακολούθησης" @@ -17776,5 +19246,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Γεννήτρια Ρεύματος" @@ -17784,39 +19254,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 "Σταθμός Παραγωγής Ρεύματος" @@ -17825,10 +19295,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 "Υποσταθμός Ρεύματος" @@ -17837,5 +19307,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Επεξεργασία Υποσταθμού Ρεύματος" @@ -17843,10 +19313,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 "Πυλώνας Ρεύματος" @@ -17857,5 +19327,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 "Επεξεργασία Πυλώνα Ρεύματος" @@ -17863,5 +19333,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Αγωγός Μεταφοράς Ρεύματος" @@ -17870,46 +19340,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 "Τηλέφωνο" @@ -17918,5 +19382,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Επεξεργασία Τηλεφώνου" @@ -17924,5 +19388,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 "Κέρματα" @@ -17930,5 +19394,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 "Χαρτονομίσματα" @@ -17936,5 +19400,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 "" @@ -17942,5 +19406,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 "Χρεωστικές Κάρτεσ" @@ -17948,15 +19412,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 "Ανακύκλωση" @@ -17965,5 +19429,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Επεξεργασία σταθμού Ανακύκλωσης" @@ -17971,80 +19435,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 "Συντριβάνι" @@ -18053,10 +19513,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 "Πόσιμο Νερό" @@ -18065,10 +19525,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 "Βρεφοδόχος" @@ -18076,25 +19536,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 "Supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Επεξεργασία Supermarket" -#. 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 "" @@ -18102,10 +19572,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 "Περίπτερο" @@ -18113,10 +19582,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 "Μηχάνημα Πώλησης" @@ -18124,5 +19612,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Επεξεργασία Μηχανήματος Πώλησης" @@ -18130,88 +19618,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 "tampons" -#: 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 "Κρεοπωλείο" @@ -18219,10 +19707,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 "Φούρνος" @@ -18230,10 +19717,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 "Ανθοπωλείο" @@ -18241,20 +19727,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 "" @@ -18262,60 +19746,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 "Είδη Κήπου" @@ -18323,10 +19801,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 "Σιδηρικά" @@ -18334,10 +19811,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 "" @@ -18345,60 +19821,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 "Στπγνοκαθαριστήριο" @@ -18406,10 +19876,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 "Πλυντήριο" @@ -18417,10 +19886,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 "" @@ -18428,35 +19896,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 "Τράπεζα" @@ -18464,16 +19929,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 "Συναλλακτήριο" @@ -18481,5 +19944,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Επεξεργασία Συναλλακτηρίου" @@ -18487,15 +19950,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 "Ιατροί" @@ -18503,20 +19966,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 "Φαρμακείο" @@ -18524,5 +19985,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Επεξεργασία Φαρμακείου" @@ -18530,10 +19991,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 "Νοσοκομείο" @@ -18541,10 +20001,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 "" @@ -18553,5 +20013,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18560,20 +20020,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)" @@ -18581,5 +20041,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 "Κτηνιατρίο" @@ -18588,55 +20048,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 "Επεξεργασία Περιφέρειας" @@ -18644,15 +20104,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Πόλη" #. 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 "Κωμόπολη" @@ -18660,10 +20120,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 "Προάστιο" @@ -18671,25 +20131,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 "" @@ -18697,5 +20157,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18703,10 +20163,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 "Νησί" @@ -18714,11 +20174,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 "Είσοδος σπηλαίου" @@ -18726,10 +20199,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 "Κορυφή" @@ -18737,10 +20210,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 "Παγετώνας" @@ -18748,10 +20221,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 "Ηφαίστειο" @@ -18759,70 +20232,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 "Δένδρο" @@ -18831,15 +20304,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 "Άλσος" @@ -18848,5 +20321,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Επεξεργασία άλσους" @@ -18854,17 +20327,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 "Δάσος" @@ -18873,14 +20346,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 "" @@ -18888,25 +20361,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 "" @@ -18914,10 +20387,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 "" @@ -18925,5 +20398,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "" @@ -18931,5 +20404,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -18938,45 +20411,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 "" @@ -18984,25 +20457,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 "" @@ -19010,10 +20483,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 "" @@ -19021,20 +20494,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 "Χώρος αναψυχής" @@ -19042,5 +20515,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Επεξεργασία χώρου αναψυχής" @@ -19048,15 +20521,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 "Νεκροταφείο" @@ -19064,9 +20537,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 "Κοιμητήριο" @@ -19074,39 +20547,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 "" @@ -19114,15 +20587,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 "" @@ -19130,55 +20603,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 "" @@ -19188,5 +20661,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 "" @@ -19195,10 +20668,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 "" @@ -19206,5 +20679,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Περιορισμός στροφής" @@ -19213,5 +20686,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Επεξεργασία περιορισμού στροφής" @@ -19219,34 +20692,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 "μόνο_ευθεία" @@ -19255,15 +20728,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 "" @@ -19271,5 +20744,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Διαδρομή" @@ -19278,5 +20751,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Επεξεργασία Διαδρομής" @@ -19284,5 +20757,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Τύπος Διαδρομής" @@ -19354,5 +20827,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 @@ -19361,17 +20834,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 "σκι" @@ -19424,5 +20897,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 @@ -19431,13 +20904,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 "παράκαμψη" @@ -19451,10 +20924,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 "Περιγραφή συμβόλου" @@ -19462,31 +20935,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 "Χρώμα (δεκαεξαδικό)" @@ -19495,30 +20968,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 "" @@ -19956,11 +21429,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 "" @@ -20286,41 +21759,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 @@ -22021,5 +23457,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 "" @@ -22618,55 +24054,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22680,5 +24067,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 "τουρισμός" @@ -22750,8 +24137,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 "ιστορικό" @@ -22822,8 +24209,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 "" @@ -22837,5 +24224,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "λατομείο" @@ -22849,5 +24236,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "Χ.Υ.Τ.Α." @@ -22869,5 +24256,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "λεκάνη" @@ -22881,5 +24268,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "δάσος" @@ -22893,5 +24280,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22914,5 +24301,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22926,5 +24313,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "βιομηχανική" @@ -22938,5 +24325,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22950,5 +24337,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22962,5 +24349,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -23017,7 +24404,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 "στρατιωτική" @@ -23031,5 +24418,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "κοιμητήριο" @@ -23042,5 +24429,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "κορυφή" @@ -23055,5 +24442,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "παγετώνας" @@ -23067,5 +24454,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "ηφαίστειο" @@ -23120,8 +24507,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 "" @@ -23135,5 +24522,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23147,19 +24534,7 @@ #. #. -#: 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 @@ -23171,5 +24546,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "λάσπη" @@ -23183,5 +24558,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "παραλία" @@ -23259,8 +24634,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 "διαδρομή" @@ -23308,7 +24683,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 "όριο" @@ -23450,10 +24825,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 "" @@ -23501,6 +24885,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 "διεύθυνση" @@ -23797,4 +25181,66 @@ msgstr "Terraserver Urban" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον " +#~ "διακομιστή." + +#~ 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 "Cannot open preferences directory: {0}" +#~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}" + +#~ msgid "nodes" +#~ msgstr "κόμβοι" + +#~ msgid "relations" +#~ msgstr "σχέσεις" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:
{0}" +#~ "" + +#~ msgid "Delete Layer" +#~ msgstr "Διαγραφή Επιπέδου" + +#~ msgid "Authors: {0}" +#~ msgstr "Συγγραφείς: {0}" + +#~ msgid "Public" +#~ msgstr "Δημόσιο" + +#~ msgid "Continue anyway" +#~ msgstr "Συνέχεια έτσι κι αλλιώς" + +#~ msgid "Edit Information Office" +#~ msgstr "Επεξεργασία Γραφείου Πληροφοριών" + +#~ msgid "Map Type" +#~ msgstr "Τύπος Χάρτη" + +#~ msgid "map" +#~ msgstr "χάρτης" + +#~ msgid "citymap" +#~ msgstr "χάρτης πόλης" + +#~ msgid "hikingmap" +#~ msgstr "χάρτης πεζοπορίας" + +#~ msgid "bicyclemap" +#~ msgstr "χάρτης ποδηλατοδρομίας" + #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -23922,7 +25368,4 @@ #~ msgstr "η έκδοση μου:" -#~ msgid "Not implemented yet." -#~ msgstr "Δεν έχει υλοποιηθεί ακόμη." - #~ msgid "Import TCX File..." #~ msgstr "Εισαγωγή αρχείου TCX..." @@ -24019,7 +25462,4 @@ #~ "συνεχίσετε;" -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" - #~ msgid "resolved version:" #~ msgstr "επιλυμένη έκδοση:" @@ -24104,7 +25544,4 @@ #~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." -#~ msgid "image loading..." -#~ msgstr "φόρτωση εικόνας..." - #~ msgid "% of lat:" #~ msgstr "% γεωγ. πλάτους:" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 17484) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 17485) @@ -10,7 +10,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-15 13:37+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-03 11:00+0000\n" +"Last-Translator: vsandre \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" @@ -18,77 +18,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Creating main GUI" #. 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 "Help" -#: ../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 "The projection {0} could not be activated. Using Mercator" -#: ../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 @@ -98,154 +101,160 @@ #: ../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 "Error" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Hint: Some changes came from uploading new data to the server." - -#: ../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] "There are unsaved changes. Discard the changes and continue?" +msgstr[1] "There are unsaved changes. Discard the changes and continue?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Unsaved Changes" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "There are unsaved changes. Discard the changes and continue?" - -#: ../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 "Save and Exit" -#: ../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 "Discard and Exit" -#: ../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 "Cancel" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{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 "Warning" -#: ../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 "Ignoring malformed file URL: \"{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 "Could not read file ''{0}''. Error is:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -270,7 +279,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" @@ -308,5 +318,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" @@ -330,6 +340,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 "Plugins" @@ -344,17 +354,26 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, java-format -msgid "" +#, 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 "" "WARNING: unexpected format of API base URL. Redirection to history page for " "OSM primitive will probably fail. API base URL is: ''{0}''" + +#: ../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 "" "WARNING: unexpected format of API base URL. Redirection to history page for " "OSM primitive will probably fail. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Please select at least one already uploaded node, way, or relation." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -365,5 +384,5 @@ "primitives only" -#: ../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 "Please select the target layer." @@ -373,11 +392,11 @@ msgstr "Select target layer" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Merge" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -388,5 +407,5 @@ "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "No target layers" @@ -403,11 +422,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 @@ -436,5 +455,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 "Latitude" @@ -443,30 +462,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 "Longitude" +#: ../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 "Align Nodes in Circle" -#: ../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 "Move the selected nodes into a circle." -#: ../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 @@ -480,6 +499,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 @@ -487,58 +506,57 @@ msgstr "Tool: {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 "Please select at least four nodes." #. 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 "Information" #. 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 "Align Nodes in Line" -#: ../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 "Move the selected nodes in to a line." -#: ../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 "Please select at least three nodes." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -549,10 +567,10 @@ "{0}, max is {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 Capabilities Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -563,5 +581,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -572,46 +590,46 @@ "length {2}. Values length is {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Precondition Violation" -#: ../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} nodes in way {1} exceed the max. allowed number of nodes {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "layer" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "selection" -#: ../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 "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "download" +#: ../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 "Zoom to {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 "Zoom the view to {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 @@ -621,22 +639,22 @@ msgstr "View: {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 "Nothing selected to zoom to." -#: ../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 "No conflicts to zoom to" +#: ../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 "Combine Way" -#: ../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 "Combine several ways into one." -#: ../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 "Please select at least two ways to combine." @@ -647,4 +665,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Combine Anyway" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -654,19 +676,7 @@ "combine them?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Combine Anyway" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Change directions?" - -#: ../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 "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -674,27 +684,34 @@ msgstr "Reverse and Combine" -#: ../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 "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" + +#: ../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 "Enter values for all conflicts." -#: ../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 "Solve Conflicts" -#: ../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 "Combine {0} ways" -#: ../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 "All the ways were empty" -#: ../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 " @@ -704,32 +721,32 @@ "nodes)" +#: ../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 "Copy" -#: ../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 "Copy selected objects to paste buffer." -#: ../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 "Please select something to copy." +#: ../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 "Create Circle" -#: ../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 "Create a circle from three selected nodes." -#: ../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 "Those nodes are not in a circle. Aborting." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../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 +758,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 "Delete" @@ -764,85 +781,86 @@ msgstr "Delete selected objects." -#: ../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 "Overwrite" -#: ../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 "File exists. Overwrite?" #. 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 "Distribute Nodes" -#: ../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 "Distribute the selected nodes to equal distances along a line." +#: ../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 "Download from 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 "Download map data from the OSM server." -#: ../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 "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Download" -#: ../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 "Please select at least one task to download" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Download referrers from 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 "Download primitives referring to one of the selected primitives" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Download referrers..." -#: ../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 "There were {0} conflicts during import." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Conflicts during download" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -851,6 +869,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 "Duplicate" @@ -874,85 +892,91 @@ msgstr "Exit the application." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "All images" + +#: ../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 "Export to 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 "Export the data to GPX file." -#: ../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 "Nothing to export. Get some data first." -#: ../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 "parameter ''{0}'' must not be null" -#: ../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 "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX file" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM Online Help" -#: ../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 "Open in Browser" -#: ../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 "Edit" -#: ../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 "Reload" -#: ../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 "Can only edit help pages from 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 "Error while loading page {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." msgstr "Help page missing. Create it in English." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1006,22 +1030,26 @@ msgstr "Merge the current layer into another layer" +#: ../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 "Merge Nodes" -#: ../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 "Merge nodes into the oldest one." -#: ../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 "Please select at least two nodes to merge." -#: ../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 "Merge nodes with different memberships?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Merge Anyway" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1031,77 +1059,73 @@ "to merge them?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Merge Anyway" - -#: ../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 "Cannot merge nodes: Would have to delete a way that is still used." -#: ../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 "Merge {0} nodes" +#: ../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 "Merge selection" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Merge the currently selected primitives into another layer" +#: ../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 "Mirror" -#: ../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 "Mirror selected nodes and ways." -#: ../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 "Please select at least one node or way." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "up" -#: ../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 "Move objects {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "down" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "left" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "right" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Move {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 "Moves Objects {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 "Cannot move objects outside of the world." @@ -1109,5 +1133,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 "New" @@ -1117,17 +1141,22 @@ msgstr "Create a new map." -#: ../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 "Open..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Open a file." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Could not read file ''{0}''. Error is:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Open a file." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Unknown role ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1165,21 +1194,17 @@ msgstr "Move nodes so all angles are 90 or 270 degree" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Only two nodes allowed" -#: ../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 "Selection must consist only of ways." -#: ../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 "Please select one or more closed ways of at least four nodes." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Please select ways with almost right angles to orthogonalise." - -#: ../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 " @@ -1191,9 +1216,9 @@ "projection to get rid of this warning.
Do you want to continue?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Only one node selected" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Orthogonalise" @@ -1209,13 +1234,26 @@ msgstr "Paste contents of paste buffer." -#: ../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 "Paste Tags" -#: ../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 "Apply tags of contents of paste buffer to all selected items." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Loading {0}" +msgstr[1] "Loading {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Undelete {0} primitives" +msgstr[1] "Undelete {0} primitives" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1241,37 +1279,32 @@ msgstr "Redo the last undone action." -#: ../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 "Rename layer" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Also rename the file" -#: ../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 "Warning: failed to put a dialog always on top. Exception was: {0}" - -#: ../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 "Could not rename file ''{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 "Reverse Ways" -#: ../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 "Reverse the direction of all selected ways." -#: ../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 "Please select at least one way." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Reverse ways" @@ -1279,10 +1312,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 "Save" #: ../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 "Save the current data." @@ -1293,37 +1327,25 @@ msgstr "File {0} exists. Overwrite?" -#: ../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 "No Exporter found! Nothing saved." -#: ../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 "" -"Internal Error: cannot check conditions for no layer. Please report this as " -"a bug." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "No document open so nothing to save." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Empty document" -#: ../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 "The document contains no data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Save anyway" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflicts" -#: ../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 " @@ -1333,28 +1355,28 @@ "if you rejected all. Continue?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Reject Conflicts and Save" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Save OSM file" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Save GPX file" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Save Layer" +#: ../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 "Save As..." -#: ../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 "Save the current data to a new file." @@ -1388,33 +1410,33 @@ msgstr "Help: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Status Report" -#: ../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 "Copy to clipboard and close" -#: ../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 "Close" +#: ../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 "Split Way" -#: ../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 "Split a way at the selected node." -#: ../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 "The current selection cannot be used for splitting." -#: ../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." @@ -1422,5 +1444,5 @@ msgstr[1] "The selected nodes are not in the middle of any way." -#: ../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 " @@ -1436,9 +1458,9 @@ "way also." -#: ../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 "The selected nodes do not share the same way." -#: ../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." @@ -1446,10 +1468,10 @@ msgstr[1] "The selected way does not contain all the selected nodes." -#: ../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 "You must select two or more nodes to split a circular way." -#: ../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 " @@ -1459,5 +1481,5 @@ "middle of the way.)" -#: ../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 " @@ -1467,5 +1489,5 @@ "should verify this and correct it when necessary." -#: ../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 " @@ -1475,8 +1497,34 @@ "this and correct it when necessary." -#: ../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 "Split way {0} into {1} parts" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Closing changeset..." + +#: ../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 "Closing changeset..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "There are currently no WMS layer to adjust." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Opening changeset..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Closing changeset..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1494,58 +1542,58 @@ msgstr "Toggles the global setting ''{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 "UnGlue Ways" -#: ../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 "Duplicate nodes that are used by multiple ways." -#: ../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 "This node is not glued to anything else." -#: ../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 "None of these nodes are glued to anything else." -#: ../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 "None of this way's nodes are glued to anything else." -#: ../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 "The current selection cannot be used for unglueing." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Select either:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* One tagged node, or" -#: ../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 "* One node that is used by more than one way, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* One way that has one or more nodes that are used by more than one way, or" + #: ../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 "" -"* One way that has one or more nodes that are used by more than one way, or" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* One way and one or more of its nodes that are used by more than one way." -#: ../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" @@ -1559,9 +1607,9 @@ "own copy and all nodes will be selected." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Unglued Node" -#: ../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" @@ -1569,5 +1617,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" @@ -1611,61 +1659,71 @@ msgstr "Updates the current data layer from the server (re-downloads data)" -#: ../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 "Updating data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "No current dataset found" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Didn't find a primitive with id {0} in the current dataset" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Update Selection" -#: ../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 "Updates the currently selected primitives from the server" -#: ../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 "There are no selected primitives to update." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Selection empty" -#: ../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 "Upload to 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 "Upload all changes to the OSM server." -#: ../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 "There are unresolved conflicts. You have to resolve these first." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "There are unresolved conflicts. You have to resolve these first." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "No changes to upload." -#: ../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 "Synchronize {0} {1} only" -#: ../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 "Synchronize entire dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1686,17 +1744,17 @@ "{6} to abort and continue editing.
" -#: ../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 "Conflict detected" #. 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 "unexpected return value. Got {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1711,32 +1769,70 @@ "{1} to abort and continue editing.
" -#: ../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}\"" msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -#: ../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 "Error header \"{0}\" does not match expected pattern \"{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 "Uploading failed.
{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 "Upload to OSM API failed" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Updating primitive" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Upload these changes?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Upload Changes" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Edit new relation in layer ''{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 "Add a new node to an existing way" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "upload all changes in one request" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1746,31 +1842,80 @@ "changed primitive" -#: ../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 "Provide a brief comment for the changes you are uploading:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Map Settings" + +#: ../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 "changeset" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objects to add:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objects to modify:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objects to delete:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Provide a brief comment for the changes you are uploading:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Upload these changes?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Upload Changes" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Uploading" +#: ../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] "Objects to add:" +msgstr[1] "Objects to add:" + +#: ../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] "Objects to modify:" +msgstr[1] "Objects to modify:" + +#: ../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] "Objects to delete:" +msgstr[1] "Objects to delete:" + +#: ../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 "Last change at {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1794,20 +1939,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 "Audio: {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 "Faster" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Faster Forwards" @@ -1849,10 +1994,10 @@ msgstr "Play previous marker." -#: ../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 "Slower" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Slower Forwards" @@ -1881,31 +2026,27 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" -#: ../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 "No data imported." -#: ../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 data" -#: ../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 "Download {0} of {1} ({2} left)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Updating data" - -#: ../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 "The following errors occurred during mass download:{0}" -#: ../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 "Errors during Download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1922,20 +2063,20 @@ " to ignore.
" -#: ../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 "Deleted or moved primitives" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Delete Mode" -#: ../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 "Delete nodes or ways." -#: ../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 @@ -1944,5 +2085,5 @@ msgstr "Mode: {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 " @@ -1952,55 +2093,69 @@ "when deleting a way. Ctrl: delete referring objects." -#: ../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 "parameter ''{0}'' must not be 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 "Draw" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Draw nodes" -#: ../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 "Mode: Draw Focus" -#: ../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 @@ -2008,38 +2163,38 @@ msgstr "selected" -#: ../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 "Cannot add a node outside of the world." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Add node" -#: ../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 "Add node into way" -#: ../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 "Connect existing way to node" -#: ../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 "Add a new node to an existing way" -#: ../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 "Add node into way and connect" -#: ../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 "Create new node." -#: ../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 "Select node under cursor." -#: ../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." @@ -2048,14 +2203,14 @@ msgstr[1] "Insert new node into {0} ways." -#: ../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 "Start new way from last node." -#: ../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 "Continue way from last node." -#: ../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 "Finish drawing." @@ -2075,5 +2230,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 "Release the mouse button to select the objects in the rectangle." @@ -2084,5 +2239,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 "Release the mouse button to stop rotating." @@ -2100,17 +2255,18 @@ "+release to synchronise audio at that point." +#: ../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 "Select" -#: ../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 "Select, move and rotate objects" -#: ../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" @@ -2119,28 +2275,32 @@ msgstr[1] "Add and move a virtual new node to {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Move elements" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 -#, java-format -msgid "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move them" +msgstr "Move them" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Undo move" + +#: ../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 "" "You did move more than {0} elements. Moving a large number of elements is " "often an error.\n" "Really move them?" -msgstr "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Move them" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Undo move" - -#: ../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." @@ -2148,5 +2308,5 @@ "Release the mouse button to stop moving. Ctrl to merge with nearest node." -#: ../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-" @@ -2173,60 +2333,60 @@ "move zoom with right button" +#: ../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 "Search..." -#: ../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 "Search for objects." -#: ../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 "Can't search because there is no loaded data." -#: ../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 "Please enter a search string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "replace selection" -#: ../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 "add to selection" -#: ../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 "remove from selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "case sensitive" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regular expression" -#: ../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' and 'Street' in any key or name." -#: ../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' in any key or name." -#: ../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' anywhere in the name." -#: ../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 - key 'type' with value exactly '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, " @@ -2236,112 +2396,113 @@ "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 - not 'Bak' in the name." -#: ../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 set to any value." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Special targets:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - type of the object (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - type of the object (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - all objects changed by user" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - object with given ID (id:0 for all new objects)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - object with given ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - object with given number of 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 - all changed objects" -#: ../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 - all selected objects" -#: ../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 - all incomplete objects" -#: ../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 "untagged - all untagged objects" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expr - all children of objects matching the expression" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent expr - all parents of objects matching the expression" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent expr - all parents of objects matching the expression" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Use | or OR to combine with logical or" -#: ../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 "Use \" to quote operators (e.g. if key contains :)" -#: ../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 "Use ( and ) to group expressions" -#: ../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 "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Start Search" -#: ../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 "No match found for ''{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 "Nothing added to selection by searching for ''{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 "Nothing removed from selection by searching for ''{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 "Found {0} matches" -#: ../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" @@ -2407,58 +2568,96 @@ msgstr "Incorrect value of id operator: {0}. Number is expected." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Load Selection" -#: ../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 "Contact {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Downloading..." -#: ../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 "Could not read from URL: \"{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 "Parsing error in URL: \"{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 "Error while communicating with server." -#: ../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 "Add node" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Add {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "Change {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/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relations: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Changeset {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Changeset {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Change relation" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Remove \"{0}\" for {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 "Remove \"{0}\" for {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Set {0}={1} for {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 "Set {0}={1} for {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Set {0}={1} for {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" @@ -2467,10 +2666,10 @@ msgstr[1] "objects" -#: ../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 "Remove \"{0}\" for {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}" @@ -2482,5 +2681,5 @@ msgstr "Change relation member role for {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2491,10 +2690,10 @@ "conflict can't be added." -#: ../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 "Double conflict" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2505,5 +2704,5 @@ "primitmive ''{1}''" -#: ../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}''" @@ -2528,44 +2727,60 @@ msgstr "cannot resolve undecided conflict" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Delete {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Delete {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] "Delete {0} {1}" +msgstr[1] "Delete {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] "Delete Mode" +msgstr[1] "Delete Mode" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Delete {0} {1}" +msgstr[1] "Delete {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] "Delete from relation" +msgstr[1] "Delete from relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Conflicting relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 -#, java-format -msgid "" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +msgid "Delete from relation" +msgstr "Delete from relation" + +#: ../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 "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" "Delete from relation?" -msgstr "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" - -#: ../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 "Delete from relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 -#, java-format -msgid "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" +msgstr "" "Selection \"{0}\" is used by relation \"{1}\".\n" "Delete from relation?" -msgstr "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Split way segment" @@ -2573,6 +2788,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." @@ -2584,5 +2799,5 @@ "be using them.
Do you really want to delete?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Delete confirmation" @@ -2593,5 +2808,5 @@ msgstr "Resolve conflicts in deleted state in {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" @@ -2628,10 +2843,20 @@ msgstr "Resolve conflicts in member list of relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Remove relation member {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" @@ -2644,17 +2869,37 @@ msgstr "Sequence" -#: ../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 "Resolve {0} tag conflicts in {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 "Resolve {0} tag conflicts in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Resolve {0} tag conflicts in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Undelete {0} primitives" -#: ../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 "Resolve version conflicts for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Resolve version conflicts for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Resolve version conflicts for {0} {1}" @@ -2681,13 +2926,13 @@ "its nodes are suggested in order to maintain data consistency." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relation" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Old role" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "New role" @@ -2706,62 +2951,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 "New value" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Apply selected changes" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Don't apply changes" -#: ../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 "Please select which property changes you want to apply." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Properties of " -#: ../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 "Roles in relations referring to" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Automatic tag correction" -#: ../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 "Malformed config file at lines {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Cannot open preferences directory: {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 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "failed to set reference. reference id {0} doesn't match history id {1}" + +#: ../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 "Preferences file had errors. Making backup of old one to {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 "Preferences stored on {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 "Could not upload preferences. Reason: {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 "Could not load preferences from server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2777,29 +3079,36 @@ msgstr "already registered a conflict for primitive ''{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 "Decimal Degrees" -#: ../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 "Degrees Minutes Seconds" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "W" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../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}" @@ -2811,15 +3120,232 @@ msgstr "parameter {0} > 0 required. Got {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 "incomplete" - -#: ../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 "Error: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Warning: {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 "parameter ''{0}'' is not a valid type name, got ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "parameter ''{0}'' is not an acceptable class, got ''{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 "There's no primitive with version {0} in this history" + +#: ../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 "There's no version valid at date ''{0}'' in this history" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "no earliest version found. History is empty." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "no latest version found. History is empty." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Didn't find an primitive with id {0} in this dataset" + +#: ../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 "Didn't find an primitive with id {0} and version {1} in this dataset" + +#: ../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 "parameter ''{0}'' > 0 expected, got ''{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 "can't compare primitive with id ''{0}'' to primitive with 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 "parameter {0} not in range 0..{1}, got {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Area style way is not closed." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "multipolygon way ''{0}'' is not closed." + +#. 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 "Empty member in relation." + +#: ../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 "Deleted member ''{0}'' in relation." + +#: ../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 "Way ''{0}'' with less than two points." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "More than one \"from\" way found." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "More than one \"to\" way found." + +#: ../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 "More than one \"via\" found." + +#: ../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 "Unknown role ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Unknown member type for ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "No \"from\" way found." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "No \"to\" way found." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "No \"via\" node or way found." + +#: ../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 "The \"from\" way doesn't start or end at a \"via\" node." + +#: ../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 "The \"to\" way doesn't start or end at a \"via\" node." + +#: ../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 "The \"from\" way doesn't start or end at the \"via\" way." + +#: ../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 "The \"to\" way doesn't start or end at the \"via\" way." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Style for restriction {0} not found." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "No useful role ''{0}'' for Way ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Non-Way ''{0}'' in multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "No outer way for multipolygon ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Intersection between ways ''{0}'' and ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Inner way ''{0}'' is outside." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Style for inner way ''{0}'' equals multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Style for outer way ''{0}'' mismatches." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "untagged" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "text" + +#. 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 "" +"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. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inactive" + #: ../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" @@ -2828,22 +3354,7 @@ msgstr[1] "nodes" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Error: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Warning: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nodes" - -#: ../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" @@ -2852,12 +3363,7 @@ msgstr[1] "ways" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "ways" - -#: ../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" @@ -2866,249 +3372,4 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relations" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "changeset" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "changesets" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "parameter ''{0}'' is not a valid type name, got ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} member" -msgstr[1] "{0} members" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "highway" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "railway" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "waterway" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "landuse" - -#: ../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} node" -msgstr[1] "{0} nodes" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "There's no primitive with version {0} in this history" - -#: ../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 "There's no version valid at date ''{0}'' in this history" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "no earliest version found. History is empty." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "no latest version found. History is empty." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Didn't find an primitive with id {0} in this dataset" - -#: ../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 "Didn't find an primitive with id {0} and version {1} in this dataset" - -#: ../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 "parameter ''{0}'' > 0 expected, got ''{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 "can't compare primitive with id ''{0}'' to primitive with 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 "parameter {0} not in range 0..{1}, got {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Area style way is not closed." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "multipolygon way ''{0}'' is not closed." - -#. 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 "Empty member in relation." - -#: ../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 "Deleted member ''{0}'' in relation." - -#: ../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 "Way ''{0}'' with less than two points." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "More than one \"from\" way found." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "More than one \"to\" way found." - -#: ../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 "More than one \"via\" found." - -#: ../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 "Unknown role ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Unknown member type for ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "No \"from\" way found." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "No \"to\" way found." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "No \"via\" node or way found." - -#: ../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 "The \"from\" way doesn't start or end at a \"via\" node." - -#: ../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 "The \"to\" way doesn't start or end at a \"via\" node." - -#: ../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 "The \"from\" way doesn't start or end at the \"via\" way." - -#: ../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 "The \"to\" way doesn't start or end at the \"via\" way." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Style for restriction {0} not found." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "No useful role ''{0}'' for Way ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Non-Way ''{0}'' in multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "No outer way for multipolygon ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Intersection between ways ''{0}'' and ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Inner way ''{0}'' is outside." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Style for inner way ''{0}'' equals multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Style for outer way ''{0}'' mismatches." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "untagged" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "text" - -#. 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 "" -"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. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inactive" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3121,5 +3382,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "background" @@ -3129,5 +3390,5 @@ msgstr "highlight" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "WGS84 Geographic" @@ -3137,5 +3398,5 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3151,21 +3412,21 @@ "and start a new layer on the new zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert Zone (France)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert Zone (Estonia)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Swiss Grid (Switzerland)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3185,9 +3446,9 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, java-format -msgid "Could not read bookmarks.
{0}" +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "Could not read bookmarks.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3195,17 +3456,103 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Do not show again" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41 -#, java-format -msgid "" +#: ../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 "incomplete" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "highway" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "railway" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "waterway" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "landuse" + +#: ../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} node" +msgstr[1] "{0} nodes" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} member" +msgstr[1] "{0} members" + +#: ../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 "" "Failed to initialize communication with the OSM server {0}.\n" "Check the server URL in your preferences and your internet connection." -msgstr "" -"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: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 "unknown" + +#: ../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 "" @@ -3218,36 +3565,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Precondition violation" -#: ../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 "unknown" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3260,9 +3580,9 @@ "applet and because you didn''t load your applet from ''{1}''." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "Security exception" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3273,9 +3593,9 @@ "check your internet connection." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "Network exception" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3284,9 +3604,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 "" @@ -3299,9 +3630,9 @@ "preferences and your internet connection." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Unknown host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3314,12 +3645,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 "Primitive already deleted" - -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 -#, java-format -msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" -msgstr "Warning: failed to bring extended dialog always on top. Exception: {0}" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3336,38 +3662,38 @@ msgstr "Downloading \"Message of the day\"" -#: ../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 "Upload Preferences" -#: ../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 "Upload the current preferences to the server" -#: ../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 "string" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Name of the user." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM Password." -#: ../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 "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -#: ../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 "string;string;..." -#: ../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 " @@ -3377,5 +3703,5 @@ "filename" -#: ../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 " @@ -3385,5 +3711,5 @@ "lat=y&lon=x&zoom=z or a filename" -#: ../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 " @@ -3393,75 +3719,94 @@ "URL which returns osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "any" -#: ../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 "If specified, reset the configuration instead of reading it." -#: ../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 "Username" -#: ../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 "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Show this help" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standard unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Download the bounding box" -#: ../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 "Download the location at the url (with 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 "Open file (as raw gps, if .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 "Download the bounding box as raw 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 "Select with the given search" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Launch in maximised mode" -#: ../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 "Reset the preferences to default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Set the language." -#: ../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 "examples" -#: ../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" @@ -3471,47 +3816,47 @@ "some data before --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 "Instead of --download= you may specify 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 "Activating updated plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Loading early plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Setting defaults" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Loading plugins" -#: ../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." msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Tools" -#: ../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 "Presets" -#: ../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 @@ -3523,21 +3868,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 "Wireframe View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Toggle Wireframe view" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Full Screen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Toggle Full Screen view" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3577,62 +3922,45 @@ msgstr "Zoom out" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "scale" -#: ../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 "The geographic longitude at the mouse pointer." -#: ../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 "The name of the object at the mouse pointer." -#: ../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 "The geographic latitude at the mouse pointer." -#: ../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 "The angle between the previous and the current way segment." -#: ../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 "The (compass) heading of the line segment being drawn." -#: ../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 "The length of the new way segment being drawn." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(no object)" -#: ../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 "layer not in list." -#: ../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 "Layer ''{0}'' must be in list of layers" - -#: ../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 "" -"Warning: failed to put option pane dialog always on top. Exception was: {0}" - -#: ../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 "" -"Warning: failed to put ''please wait dialog'' always on top. Exception was: " -"{0}" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 @@ -3643,10 +3971,4 @@ msgid "File not found" msgstr "File not found" - -#: ../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 @@ -3706,7 +4028,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" @@ -3722,5 +4043,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" @@ -3826,5 +4147,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 "My version" @@ -3835,5 +4156,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" @@ -3849,5 +4170,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 "Their version" @@ -3931,6 +4252,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" @@ -4045,10 +4366,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 "unexpected column index. Got {0}" -#: ../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 "" @@ -4059,19 +4380,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 "Communication with server failed" -#: ../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 "Yes, undelete them too" -#: ../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 "No, cancel operation" -#: ../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 "" @@ -4082,5 +4403,5 @@ "the server.

Do you want to undelete these nodes too?" -#: ../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 "Undelete additional nodes?" @@ -4101,9 +4422,9 @@ msgstr "Undelete dependent primitives?" -#: ../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 "Properties in my dataset, i.e. the local dataset" -#: ../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 " @@ -4113,113 +4434,115 @@ "elements when merge decisions are applied." -#: ../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 "Properties in their dataset, i.e. the server dataset" -#: ../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 "Coordinates:" -#: ../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 "Deleted State:" -#: ../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 "Visible State:" -#: ../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 "(none)" -#: ../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 "deleted" -#: ../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 "not deleted" -#: ../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 "visible (on the server)" -#: ../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 "not visible (on the server)" -#: ../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 "Keep a clone of the local version" -#: ../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 "Physically delete from local dataset" -#: ../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 "Keep my coordiates" -#: ../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 "Keep their coordiates" -#: ../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 "Undecide conflict between different coordinates" -#: ../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 "Keep my deleted state" -#: ../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 "Keep their deleted state" -#: ../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 "Undecide conflict between deleted state" -#: ../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 "Keep my visible state" -#: ../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 "Yes, reset the 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 "No, abort" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587 -#, java-format -msgid "" +#: ../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 "" "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?" -msgstr "" -"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:595 + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 msgid "Reset id to 0" msgstr "Reset id to 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 "Keep their visible state" -#: ../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 "Yes, purge it" -#: ../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 "" @@ -4230,21 +4553,21 @@ "dataset.
Do you agree?" -#: ../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 "Remove from dataset" -#: ../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 "Undecide conflict between visible state" #: ../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 "Role" #: ../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 "Primitive" @@ -4283,10 +4606,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 @@ -4295,10 +4619,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 @@ -4312,5 +4637,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}" @@ -4351,4 +4676,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Their dataset does not include a tag with key {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 "none" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "all" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Choose a colour" + +#: ../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 "parameter ''{0}'' is not a valid type name, got ''{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 "parameter ''{0}'' must not be 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 "parameter ''{0}'' in range 0..{1} expected, got {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 "not deleted" + +#: ../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 "Not implemented yet." + +#: ../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 "from way" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Delete from relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Conflicts in data" + +#: ../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} way" +msgstr[1] "{0} ways" + +#: ../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} relation" +msgstr[1] "{0} relations" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Conflict Resolution" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Resolve conflicts" + +#: ../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 "Apply" + +#: ../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 "Paste" + +#: ../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} start" +msgstr[1] "{0} start" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4364,10 +4826,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 @@ -4375,5 +4837,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}" @@ -4404,5 +4866,5 @@ #: ../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." @@ -4410,33 +4872,25 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 -msgid "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" -msgstr "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" - -#: ../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 "Cancel conflict resolution and close the dialog" -#: ../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 "Apply resolved conflicts and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Apply Resolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "Close anyway" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Continue resolving" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4453,151 +4907,118 @@ "{1} to return to resolving conflicts." -#: ../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 "Conflict not resolved completely" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Resolve conflicts" -#: ../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 "Resolve conflicts for ''{0}''" -#: ../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 "History" -#: ../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 "Display the history of all selected items." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "Failed to load history from the server. Details:
{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 "index out of bounds Got {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 "Node {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 "Layer: {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 "Relations: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "History item" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Load history" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Loading history for {0} with 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 "Reload all currently selected objects and refresh the list." #. 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 "Show" -#: ../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 "Display the history of the selected primitive" -#: ../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 "Dialog not created yet. Invoke createInstance() first" -#: ../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 "Layers" -#: ../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 "Open a list of all loaded layers." -#: ../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 "Delete the selected layer." -#: ../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 "" -"There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -msgid "Delete Layer" -msgstr "Delete Layer" - -#: ../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 "Do you really want to delete layer ''{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 "Confirmation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "Yes" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "No" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Delete all" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "Deleting layer {0} of {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Show/Hide" -#: ../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 "Toggle visible state of the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "Activate" -#: ../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 "Activate the selected layer" -#: ../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 "Merge this layer into another layer" -#: ../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 "Move the selected layer one row up." -#: ../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 "Move the selected layer one row down." -#: ../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 "Information about layer" -#: ../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." @@ -4606,29 +5027,22 @@ msgstr[1] "This will change up to {0} objects." -#: ../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 "An empty value deletes the key." -#: ../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 "Change values?" -#: ../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 "" -"Warning: failed to put properties dialog always on top. Exception was: {0}" - -#: ../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" @@ -4637,89 +5051,84 @@ msgstr[1] "Change properties of up to {0} objects" -#: ../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 "Please select a key" -#: ../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 "Please select a value" -#: ../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 "Warning: failed to put dialog always on top. Exception was: {0}" - -#: ../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 "Please select the objects you want to change properties for." -#: ../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 "Properties/Memberships" -#: ../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 "Properties for selected objects." #. 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 "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Add Properties" -#: ../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 "Add" -#: ../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 "Add a new key/value pair to all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Edit Properties" -#: ../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 "Edit the value of the selected key for all objects" -#: ../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 "Properties: {0} / Memberships: {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 "Properties / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Change relation" -#: ../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 "Really delete selection from relation {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 "Delete the selected key in all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Delete Properties" @@ -4728,34 +5137,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 "Relations" -#: ../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 "Open a list of all relations." -#: ../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 "Relations: {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 "Open an editor for the selected relation" -#: ../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 "Delete the selected relation" -#: ../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 "Create a new relation" -#: ../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 "Create a copy of this relation and open it in another editor window" @@ -4788,23 +5197,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 "Selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} way" -msgstr[1] "{0} ways" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relation" -msgstr[1] "{0} relations" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4812,14 +5207,9 @@ msgstr "Selection: {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 "Undock the panel" -#: ../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 "Warning: failed to put toggle dialog always on top. Exception was: {0}" - -#: ../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." @@ -4827,64 +5217,100 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../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 "Click to minimise/maximise the panel content" -#: ../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 "Authors" -#: ../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 "Open a list of people working on the selected objects." -#: ../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] "Author" +msgstr[1] "Author" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +#, fuzzy +msgid "Select primitives submitted by this user" +msgstr "Select primitives for selected relation members" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Show" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "More information about this feature" + +#: ../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 "" +"WARNING: launching browser windows for the first {0} of {1} selected " +"primitives only" + +#: ../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 "Author" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Authors: {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 "Edit the relation the currently selected relation member refers to" -#: ../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 "Download all child relations (recursively)" -#: ../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 "Download All Children" -#: ../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 "Download selected relations" -#: ../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 "Download Selected Children" -#: ../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 "Download relation members" -#: ../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 "Conflicts in data" -#: ../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 "" @@ -4895,48 +5321,41 @@ "loaded" -#: ../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 "Relation is deleted" -#: ../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 "Downloading relation {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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 "Warning: ignoring exception because task is cancelled. Exception: {0}" -#: ../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 "Tags and Members" -#: ../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 "Parent Relations" -#: ../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 "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 -#, java-format -msgid "" -"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" -msgstr "" -"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" - #. --- 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 "Role:" -#: ../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 " @@ -4948,14 +5367,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../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 "Remove them, clean up relation" -#: ../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 "Ignore them, leave relation as is" -#: ../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 "" @@ -4968,9 +5387,9 @@ "html>" -#: ../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 "Multiple members referring to same primitive" -#: ../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 "" @@ -4983,5 +5402,5 @@ "''{0}''." -#: ../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" @@ -4989,5 +5408,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../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" @@ -4995,5 +5414,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../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 " @@ -5003,5 +5422,5 @@ "member" -#: ../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 " @@ -5011,15 +5430,15 @@ "member" -#: ../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 "Remove all members referring to one of the selected primitives" #. 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 "Relation Editor: Remove Selected" -#: ../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" @@ -5027,5 +5446,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../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 "" @@ -5036,57 +5455,57 @@ "selection" -#: ../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 "Select primitives for selected relation members" -#: ../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 "Sort the relation members" #. 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 "Relation Editor: Sort" -#: ../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 "Move the currently selected members up" #. 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 "Relation Editor: Move Up" -#: ../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 "Move the currently selected members down" #. 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 "Relation Editor: Move Down" -#: ../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 "Remove the currently selected members from this relation" #. 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 "Relation Editor: Remove" -#: ../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 "Delete the currently edited relation" -#: ../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 "Yes, create a conflict and close" -#: ../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 "No, continue editing" -#: ../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 " @@ -5098,9 +5517,9 @@ "conflict and close the editor?" -#: ../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 "Conflict in data" -#: ../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 "" @@ -5111,20 +5530,16 @@ "
Please resolve this conflict first, then try again." -#: ../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 "Apply the current updates" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "Apply" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialog" -#: ../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 @@ -5134,37 +5549,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 "Cancel the updates and close the dialog" -#: ../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 "Add an empty tag" -#: ../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 "Delete the currently selected tags" -#: ../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 "Download all incomplete ways and nodes in relation" -#: ../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 "Download Members" -#: ../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 "Relation Editor: Download Members" -#: ../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 "Sets a role for the selected members" -#: ../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 "Apply Role" -#: ../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 "" @@ -5177,30 +5592,30 @@ "new role?" -#: ../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 "Yes, apply it" -#: ../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 "No, don't apply" -#: ../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 "Confirm empty role" -#: ../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 "Zoom to" -#: ../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 "Zoom to primitive the first selected member refers to" -#: ../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 "Zooming disabled because layer of this relation is not active" -#: ../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 "Zooming disabled because there is no selected member" @@ -5214,22 +5629,27 @@ msgstr "Linked" -#: ../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 "Download referring relations" -#: ../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 "child.id >0 expected. Got {1}" -#: ../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 "including immediate children of parent relations" -#: ../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 "Load parent relations" -#: ../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 "Load parent relations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "Edit the currently selected relation" @@ -5263,34 +5683,21 @@ "Warning: ignoring exception because task was cancelled. Exception was: " -#: ../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] "Remove old keys from up to {0} object" -msgstr[1] "Remove old keys from up to {0} objects" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bookmarks" -#: ../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 "Please enter the desired coordinates first." -#: ../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 "Please enter a name for the location." -#: ../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 "Name of location" -#: ../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 "Select a bookmark first." @@ -5346,13 +5753,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 "Null pointer exception, possibly some missing tags." -#: ../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 "Please enter a search string" -#: ../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 "Cannot read place search results from server" @@ -5360,18 +5767,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 "Enter a place name to search for:" -#. 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 "Places" #. 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 "name" @@ -5410,37 +5816,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 "type" -#: ../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 "near" -#: ../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 "zoom" -#: ../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: " @@ -5452,5 +5858,5 @@ "Click." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Slippy map" @@ -5477,31 +5883,39 @@ msgstr "Tile Numbers" -#: ../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 "History for {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 "" -"Warning: failed to put history browser always on top. Exception was: {0}" - -#: ../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 "History for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "History for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Close the dialogue" -#: ../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 "Display the history of the selected primitive" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "history not initialised yet. Failed to set reference primitive." -#: ../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 "failed to set reference. reference id {0} doesn't match history id {1}" -#: ../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" @@ -5509,17 +5923,36 @@ "failed to set reference. reference version {0} not available in history" -#: ../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 "history not initialised yet. Failed to set current primitive." -#: ../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 "failed to set current. current version {0} not available in history" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Node {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Load history" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "child.id >0 expected. Got {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Loading history for {0} with id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Loading history for {0} with id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Loading history for {0} with id {1}" #. item "Streets/Motorway" text "Reference" @@ -5837,14 +6270,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6020,8 +6467,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" #. @@ -6118,4 +6571,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6229,6 +6685,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 @@ -6236,155 +6692,173 @@ #: 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 "Name" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 -#, java-format -msgid "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 +#, fuzzy, java-format +msgid "" +"Version {0} created on {1} by " +"{2} in changeset {3}" +msgstr "" "Version {0} created on {1} by " "{2}" -msgstr "" -"Version {0} created on {1} by " -"{2}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Changeset {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "More information about this feature" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Changeset {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6393,32 +6867,288 @@ msgstr "Version {0} created on {1} by {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Version" -#: ../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 "Street name" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Yes" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "No" + +#: ../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 "Please select a value" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Layer ''{0}'' must be in list of layers" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Fix tag conflicts" + +#: ../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] "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +#, fuzzy +msgid "Unsafed data non-writable files" +msgstr "Use default tag ignore file." + +#: ../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 "Discard and Exit" + +#: ../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 "Save and Exit" + +#: ../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 "Layer" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "On upload" + +#: ../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 "File" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Uploading" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "There are no selected primitives to update." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Images for {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 "Read 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 "No time for point {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 "Cannot read time \"{0}\" from point {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 "No images with readable timestamps found." -#: ../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 @@ -6426,29 +7156,29 @@ msgstr "Reading {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 "Geotagged Images" -#: ../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 start: {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 end: {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 "current delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "timezone difference: " -#: ../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" @@ -6457,14 +7187,14 @@ msgstr[1] "images" -#: ../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} within the track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sync clock" -#: ../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 @@ -6472,82 +7202,82 @@ msgstr "JPEG images (*.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 "The date in file \"{0}\" could not be parsed." -#: ../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 "There is no EXIF time within the file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Image" -#: ../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 "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#: ../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 unit timezone (difference to photo)" -#: ../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 "Synchronise Time with GPS Unit" -#: ../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 "Time entered could not be parsed." -#: ../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 point" -#: ../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 "Customise line drawing" +#: ../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 "Use global settings." + #: ../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 "Use global settings." +msgid "Draw lines between points for this layer." +msgstr "Draw lines between points for this layer." #: ../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 "Draw lines between points for this layer." - -#: ../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 "Do not draw lines between points for this layer." -#: ../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 "Select line drawing options" -#: ../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 "Customise Colour" -#: ../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 "Default" -#: ../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" @@ -6607,5 +7337,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}" @@ -6621,10 +7351,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 "Convert to data layer" #: ../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." @@ -6635,11 +7365,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 @@ -6681,4 +7411,9 @@ "wish
to continue?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Downloading data" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6701,64 +7436,64 @@ "time were omitted." -#: ../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 "Data Layer {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 "outside downloaded area" -#: ../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 "version {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 "Warning: mixing 0.6 and 0.5 data results in version 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} consists of:" -#: ../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} deleted.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "unset" -#: ../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 version: {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 "Convert to GPX layer" -#: ../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" @@ -6766,5 +7501,5 @@ msgstr[1] "tracks" -#: ../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" @@ -6772,5 +7507,5 @@ msgstr[1] "points" -#: ../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" @@ -6779,5 +7514,5 @@ msgstr[1] "a track with {0} points" -#: ../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 +7521,5 @@ msgstr[1] "{0} consists of {1} tracks" -#: ../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" @@ -6793,9 +7528,9 @@ msgstr[1] "{0} points" -#: ../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 marker" -#: ../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" @@ -6803,5 +7538,5 @@ msgstr[1] "markers" -#: ../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" @@ -6821,5 +7556,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}." @@ -6827,5 +7562,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 "Unable to synchronise in layer being played." @@ -6855,5 +7590,5 @@ msgstr "Toggle visible state of the marker text and icons." -#: ../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 " @@ -6863,5 +7598,5 @@ "track you were playing (after the first marker)." -#: ../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 " @@ -6871,29 +7606,29 @@ "point where you want to synchronise." -#: ../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 "Unable to create new audio marker." -#: ../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 "There was an error while trying to display the URL for this marker" -#: ../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 "(URL was: " -#: ../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 "Error displaying 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 "Advanced Preferences" -#: ../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 "Setting Preference entries directly. Use with caution!" -#: ../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 @@ -6901,26 +7636,26 @@ msgstr "Search: " -#: ../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 "Current value is default." -#: ../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 "Default value is ''{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 "Default value currently unknown (setting has not been used yet)." -#: ../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 "Please select the row to edit." -#: ../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 @@ -6928,14 +7663,14 @@ msgstr "New value for {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 "Please select the row to delete." -#: ../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 "Enter a new key/value pair" @@ -7072,40 +7807,40 @@ msgstr "Voice recorder calibration" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Colour" -#: ../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 "Paint style {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 "Layer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Choose" -#: ../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 "Choose a colour for {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 "Set to default" -#: ../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 "Set all to default" -#: ../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 "Colours used by different objects in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Colours" @@ -7149,5 +7884,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Car" @@ -7169,16 +7904,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 "Bicycle" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7208,12 +7944,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 "Foot" @@ -7395,5 +8131,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 "Show splash screen at startup" @@ -7401,23 +8137,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 "Show object ID in selection lists" #: ../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 "Show object ID in selection lists" + +#: ../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 "Draw rubber-band helper line" -#: ../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 "Modeless working (Potlatch style)" -#: ../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 "Show object ID in selection lists" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Do not require to switch modes (potlatch style workflow)" -#: ../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 "Look and Feel" @@ -7449,54 +8196,54 @@ msgstr "Used style" -#: ../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 "Configure available plugins." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Download List" -#: ../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 "Update" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Configure Sites..." -#: ../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 "Add JOSM Plugin description URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" msgstr "Enter URL" -#: ../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 "Please select an entry." -#: ../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 "Edit JOSM Plugin description URL." -#: ../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 "JOSM Plugin description URL" -#: ../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 "Configure Plugin Sites" #. 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 "Display Settings" -#: ../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 " @@ -7506,41 +8253,41 @@ "program." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Connection Settings" -#: ../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 "Connection Settings for the OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Map Settings" -#: ../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 "Settings for the map projection and data interpretation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Audio Settings" -#: ../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 "Settings for the audio player and audio markers." -#: ../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 "You have to restart JOSM for some settings to take effect." -#: ../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 "Display coordinates as" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projection method" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Map Projection" @@ -7573,12 +8320,4 @@ msgid "Proxy server password" msgstr "Proxy server password" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "The base URL for the OSM server (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Base Server URL" #. 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 @@ -7605,61 +8344,60 @@ msgstr "Shortcut" -#: ../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 "Short Description: {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 "Author: {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 "Webpage: {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 "Version: {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 "Icon paths" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Copy defaults" -#: ../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 "Please select the row to copy." -#: ../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 "The XML source (URL or filename) for {0} definition files." -#: ../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 "Add a new XML source to the list." -#: ../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 "Delete the selected source from the list." -#: ../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 "Defaults (See tooltip for detailed information)" @@ -7850,36 +8588,59 @@ msgstr "Modifier Groups" -#: ../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] "Remove old keys from up to {0} object" +msgstr[1] "Remove old keys from up to {0} objects" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Add a new layer" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Delete the selected layer." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "More information about this feature" #. 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 "Optional Attributes:" -#: ../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 "Use preset ''{0}'' of group ''{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 "Use preset ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "closed way" -#: ../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 "Unknown type: {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 @@ -7887,15 +8648,15 @@ msgstr "Could not read tagging preset source: {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 "Error parsing {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 "Elements of type {0} are supported." -#: ../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 @@ -7905,22 +8666,22 @@ msgstr[1] "Change {0} objects" -#: ../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 "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Change Properties" -#: ../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}''" @@ -7959,11 +8720,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 "Could not read \"{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 " @@ -7973,38 +8734,38 @@ "tracks." -#: ../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 "GPX Files" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "gps track description" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Add author information" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Real name" -#: ../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 "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Predefined" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Copyright year" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Keywords" @@ -8014,9 +8775,9 @@ msgstr "Export options" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Export and Save" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8027,10 +8788,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 "Choose a predefined licence" -#: ../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 @@ -8040,12 +8801,12 @@ msgstr "Markers from {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 "File \"{0}\" does not exist" -#: ../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" @@ -8066,6 +8827,6 @@ msgstr "no primitive with id {0} in local dataset. Can't infer primitive type" -#: ../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 @@ -8075,20 +8836,40 @@ msgstr "Downloading OSM data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 -#, java-format -msgid "Fetching {0} with id {1} from ''{2}''" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#, fuzzy, java-format +msgid "Fetching node with id {0} from ''{1}''" msgstr "Fetching {0} with id {1} from ''{2}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, fuzzy, java-format +msgid "Fetching way with id {0} from ''{1}''" +msgstr "Fetching {0} with id {1} from ''{2}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#, fuzzy, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "Fetching {0} with id {1} from ''{2}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Server replied with response code 404 for id {0}. Skipping." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 -#, java-format -msgid "Fetching a package of {0} from ''{1}''" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#, fuzzy, java-format +msgid "Fetching a package of nodes from ''{0}''" msgstr "Fetching a package of {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#, fuzzy, java-format +msgid "Fetching a package of ways from ''{0}''" +msgstr "Fetching a package of {0} from ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#, fuzzy, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "Fetching a package of {0} from ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8098,34 +8879,34 @@ "for each primitive" -#: ../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 Files" -#: ../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 "Coordinates imported: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Malformed sentences: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Checksum errors: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Unknown sentences: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Zero coordinates: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA import success" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA import failure!" @@ -8136,9 +8917,9 @@ msgstr "preference ''{0}'' missing. Can't initialize 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 "This version of JOSM is incompatible with the configured server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8149,15 +8930,15 @@ "{0} to {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 "Communications with {0} established using protocol version {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 "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8166,33 +8947,91 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{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 "Opening changeset..." -#: ../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 "Opening changeset..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Opening changeset..." + +#: ../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 "Opening changeset..." + +#: ../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 "Closing changeset..." -#: ../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 "Closing changeset..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Opening changeset..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Uploading..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, fuzzy, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "Starting retry {0} of {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "OK - trying again." -#: ../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}." @@ -8220,29 +9059,33 @@ msgstr "Invalid bz2 file." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Incorrect password or username." -#: ../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 "Warning: The password is transferred unencrypted." -#: ../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 "Save user and password (unencrypted)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Enter Password" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Login" -#: ../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 "The base URL for the OSM server (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Login name (e-mail) to the OSM account." -#: ../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." @@ -8250,13 +9093,17 @@ "Login password to the OSM account. Leave blank to not store any password." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Base Server URL" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM username (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 password" -#: ../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." @@ -8268,20 +9115,20 @@ "URL.
Do not use a valuable Password." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM Server Files" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "Expected instance of OsmDataLayer. Got ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "An error occurred while saving.
Error is:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8292,5 +9139,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8493,39 +9340,48 @@ "Couldn't connect to the osm server. Please check your internet connection." -#: ../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} left. Uploading {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 "" -"Failed to close changeset {0}, will be closed by server after timeout. " -"Exception was: {1}" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 -#, java-format -msgid "" +#: ../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} left. Uploading {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} left. Uploading {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#, fuzzy, java-format +msgid "" +"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " +"use diff uploads, but API is not able to handle them. Ignoring diff upload." +msgstr "" "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " "use changesets, but API is not able to handle them. Ignoring changesets." -msgstr "" -"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " -"use changesets, but API is not able to handle them. Ignoring changesets." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 +#, fuzzy +msgid "Starting to upload in one request ..." +msgstr "Nothing to upload. Get some data first." + +#: ../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 "Update Plugins" -#: ../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 "Download Plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8538,5 +9394,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." @@ -8545,23 +9401,23 @@ msgstr[1] "{0} Plugins successfully downloaded. Please restart 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 "Downloading Plugin {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Skip download" -#: ../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 version {0} required for plugin {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Download Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Skip Download" @@ -8572,5 +9428,5 @@ msgstr "An error occurred in plugin {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." @@ -8578,25 +9434,25 @@ "Loading of {0} plugin was requested. This plugin is no longer required." -#: ../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 "Plugin {0} requires JOSM update to version {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 "Plugin {0} is required by plugin {1} but was not found." -#: ../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 "Plugin not found: {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 "Last plugin update more than {0} days ago." -#: ../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 " @@ -8606,21 +9462,21 @@ "setting the config option '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 "Disable plugin" -#: ../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 "Could not load plugin {0}. Delete from preferences?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Keep plugin" -#: ../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 " @@ -8630,5 +9486,5 @@ "overwrite the existing ones." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8637,10 +9493,10 @@ "An unexpected exception occurred that may have come from the ''{0}'' plugin." -#: ../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 "According to the information within the plugin, the author is {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." @@ -8648,9 +9504,9 @@ "Try updating to the newest version of this plugin before reporting a bug." -#: ../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 "Should the plugin be disabled?" -#: ../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 " @@ -8660,13 +9516,13 @@ "unload the plugin." -#: ../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 "The plugin could not be removed. Probably it was already disabled" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "Plugin information" -#: ../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" @@ -8677,5 +9533,5 @@ msgstr "More details" -#: ../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" @@ -8684,18 +9540,18 @@ msgstr[1] "Downloaded plugin information from {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "No plugin information found." -#: ../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 "Plug-in named {0} is not available. Update skipped." -#: ../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 "All installed plugins are up to date." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8708,9 +9564,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 "Download missing plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8723,35 +9579,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}: Version {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 "Plugin bundled with 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 "Error reading plugin information file: {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 "This is after the end of the recording" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Error playing sound" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Do nothing" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Report Bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8765,18 +9621,18 @@ "version of JOSM, please consider being kind and file a bug report." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Unexpected Exception" -#: ../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 "Please report a ticket at {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 "Include your steps to get to the error (as detailed as possible)!" -#: ../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 " @@ -8786,19 +9642,19 @@ "a bug." -#: ../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 "Be sure to include the following information:" -#: ../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 "(The text has already been copied to your clipboard.)" -#: ../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 "Unable to find translation for the locale {0}. Reverting to {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 "" @@ -8809,5 +9665,5 @@ "was: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8818,5 +9674,5 @@ "problem. JOSM will stop working." -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8829,5 +9685,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" @@ -8837,5 +9693,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8846,17 +9702,17 @@ "\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 "(Hint: You can edit the shortcuts in the preferences.)" -#: ../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 "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" -#: ../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 "" @@ -8866,4 +9722,39 @@ "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " "was: {1}" + +#: ../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 "" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 @@ -8891,9 +9782,27 @@ msgstr "Create a grid of ways" -#: ../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 "Upload Trace" -#: ../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 @@ -8901,27 +9810,40 @@ msgstr "Upload Traces" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Public" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Selected makes your trace public in 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 "Description" -#: ../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 "Please enter Description about your trace." -#: ../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 "Please enter tags about your trace." -#: ../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}" @@ -8929,47 +9851,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 "Connecting..." -#: ../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 "Upload cancelled" -#: ../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 "Error while uploading" -#: ../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 upload was successful" -#: ../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 "Upload failed. Server returned the following message: " -#: ../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 "Uploading GPX track: {0}% ({1} of {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 "No description provided. Please provide some description." -#: ../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 "No GPX layer selected. Cannot upload a trace." -#: ../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 "No username provided." -#: ../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 "No password provided." -#: ../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 "Uploading GPX Track" @@ -9082,19 +10004,19 @@ msgstr "Load set of images as a new layer." -#: ../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 Files (*.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 "File {0} is loaded yet under the name \"{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 "Error while parsing {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." @@ -9106,34 +10028,34 @@ "on the photo and select a timezone
" -#: ../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 "Photo time (from 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 time (read from the above photo): " -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "I'm in the timezone of: " -#: ../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 "No date" -#: ../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 "Open an other photo" -#: ../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 "Synchronise time from a photo of the GPS receiver" -#: ../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" @@ -9143,70 +10065,70 @@ "Please use the requested format" -#: ../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 "Invalid date" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 track: " -#: ../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 "Open another GPX trace" -#: ../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 "Timezone: " -#: ../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 "Offset:" -#: ../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 "" "I can take a picture of my GPS receiver.
Can this help?" -#: ../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 "Update position for: " -#: ../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 "All images" -#: ../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 "Images with no exif position" -#: ../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 "Not yet tagged images" -#: ../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 "Correlate images with GPX track" -#: ../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 "Correlate" -#: ../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 "Auto-Guess" -#: ../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 "You should select a GPX track" -#: ../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 "No selected GPX track" -#: ../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 "" @@ -9217,9 +10139,9 @@ "Expected format: {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 "Invalid timezone" -#: ../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 "" @@ -9230,26 +10152,26 @@ "Expected format: {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 "Invalid offset" -#: ../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 "Found {0} matches of {1} in GPX track {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 Track loaded" -#: ../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 "The selected photos don't contain time information." -#: ../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 "Photos don't contain time information" -#: ../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." @@ -9257,39 +10179,39 @@ "The selected GPX track doesn't contain timestamps. Please select another one." -#: ../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 Track has no time information" -#: ../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 "Timezone: {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 "Minutes: {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 "Seconds: {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 "Matched {0} of {1} photos to GPX track." -#: ../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 "(Time difference of {0} days)" -#: ../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 "Offset between track and photos: {0}m {1}s" -#: ../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 " @@ -9299,13 +10221,13 @@ "adjust the sliders to manually match the photos." -#: ../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 "Matching photos to track failed" -#: ../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 "Adjust timezone and offset" -#: ../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 "Default Values" @@ -9326,5 +10248,5 @@ msgstr "Error on file {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9337,12 +10259,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 "Select All" - -#: ../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 "Error loading file" @@ -9371,8 +10292,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 "" "Town/city {0} not found or not available in WMS.\n" @@ -9383,21 +10304,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 "Select commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Choose from..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../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" @@ -9409,37 +10330,49 @@ "Would you like to restore F11 for grab action ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Restore grab shortcut F11" -#: ../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 "JOSM is stopped for the change to take effect." -#: ../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 "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Replace original background by JOSM background colour." -#: ../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 "Reverse grey colours (for black backgrounds)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Set background transparent." -#: ../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 "Draw boundaries of downloaded data." -#: ../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 "Enable automatic caching." -#: ../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 "Max. cache size (in MB)" -#: ../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." @@ -9457,18 +10390,18 @@ "by this plugin." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "French cadastre 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 "Value of key \"source\" when autosourcing is enabled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Source" -#: ../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 " @@ -9478,5 +10411,5 @@ "preferences." -#: ../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). " @@ -9486,41 +10419,39 @@ "Useful for texts on dark backgrounds." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../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 "Set WMS layers transparency. Right is opaque, left is transparent." -#: ../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 "Draw a rectangle around downloaded data from WMS server." #. 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 "Image grab multiplier:" - -#: ../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 "Grab smaller images (higher quality but use more memory)" -#: ../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 "Fixed size square (default is 100m)" -#: ../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 "Fixed size (from 25 to 1000 metres)" -#: ../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 "Image grab multiplier:" - -#: ../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 "Oldest files are automatically deleted when this size is exceeded" @@ -9578,12 +10509,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contacting WMS Server..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "image not loaded" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9617,23 +10546,24 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:81 -msgid "" +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 +#, fuzzy +msgid "" +"To enable the cadastre WMS plugin, change\n" +"the current projection to one of the cadastre\n" +"projections and retry" +msgstr "" "To enable the cadastre WMS plugin, change\n" "the current projection to one of the cadastre\n" "projection and retry" -msgstr "" -"To enable the cadastre WMS plugin, change\n" -"the current projection to one of the cadastre\n" -"projection and retry" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44 + +#: ../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" @@ -9641,9 +10571,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 "image loading..." + +#: ../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" @@ -9651,31 +10587,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 "Enter Lat/Lon to jump to position." - -#: ../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 "east" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "north" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Keep their coordiates" +msgid "Set " +msgstr "Select" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9739,6 +10683,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)" @@ -9762,6 +10706,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 "Blank Layer" @@ -9777,7 +10721,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Raster centre: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10305,6 +11249,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 "water" @@ -10317,8 +11261,4 @@ msgid "land" msgstr "land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "none" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10608,9 +11548,9 @@ msgstr "OpenStreetBugs download loop" -#: ../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 "Displays OpenStreetBugs issues" -#: ../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 " @@ -10622,5 +11562,5 @@ "new server? (Strongly recommended)" -#: ../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 "Switch to new openstreetbugs server?" @@ -11194,5 +12134,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 "Street name" @@ -11211,29 +12151,29 @@ msgstr "Show Author Panel" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Open User Page" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Open User Page in browser" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Select User's Data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Replaces Selection with Users data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Please select some data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Please choose a user using the author panel" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Sorry, doesn't work with anonymous users" @@ -11247,23 +12187,15 @@ msgstr "Joins areas that overlap each other" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Continue anyway" - -#: ../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 "Only up to two areas can be joined at the moment." -#: ../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}\" is not closed and therefore can't be joined." -#: ../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" @@ -11275,38 +12207,38 @@ "Are you really sure to continue?" -#: ../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 "Please abort if you are not sure" -#: ../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 "Please select at least one closed way the should be joined." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "No intersection found. Nothing was changed." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Added node on all intersections" -#: ../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 "Delete Ways that are not part of an inner multipolygon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Fix relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Joined self-overlapping area" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Joined overlapping areas" -#: ../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 " @@ -11316,81 +12248,81 @@ "verify no errors have been introduced." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Fix tag conflicts" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Removed Element from Relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Join Areas: Remove Short Ways" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Closed Way" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Remove tags from inner ways" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Join Areas Function" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Jump To Position" -#: ../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 "Opens a dialog that allows to jump to a specific location" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Enter Lat/Lon to jump to position." -#: ../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 "You can also paste an URL from www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (in metres)" -#: ../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 "Jump there" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Jump to Position" -#: ../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 "Could not parse Latitude, Longitude or Zoom. Please check." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Unable to parse Lon/Lat" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Simplify Way" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Delete unnecessary nodes from a way." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Please select at least one way to simplify." -#: ../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?" @@ -11402,25 +12334,25 @@ "The selection contains {0} ways. Are you sure you want to simplify them all?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Are you sure?" -#: ../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 "Validation errors" -#: ../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 "No validation errors" -#: ../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 "Grid" -#: ../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 "" @@ -11511,53 +12443,53 @@ msgstr "Performs the data validation" -#: ../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 "Data with errors. Upload anyway?" -#: ../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 "Open the validation window." -#: ../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 "Zoom to problem" -#: ../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 "Fix" -#: ../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 "Fix the selected errors." -#: ../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 "Ignore" -#: ../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 "Ignore the selected errors next time." -#: ../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 "Whole group" -#: ../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 "Single elements" -#: ../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 "Nothing" -#: ../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 "Ignore whole group or individual elements?" -#: ../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 "Ignoring elements" -#: ../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" @@ -11581,23 +12513,56 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -msgid "" +#, 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 "" "This test checks if two roads, railways or waterways crosses in the same " "layer, but are not connected by a node." -msgstr "" -"This test checks if two roads, railways or waterways crosses in the same " -"layer, but are not connected by a node." - -#: ../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 "Create buildings" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Crossing ways" -#: ../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 "Duplicated nodes" -#: ../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 "This test checks that there are no nodes at the very same location." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Nodes with same name" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Confirmation" + +#: ../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 "Duplicate Way" + +#: ../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 "This test checks that there are no nodes at the very same location." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Create duplicate way" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11684,23 +12649,23 @@ "This test checks for ways with similar names that may have been misspelt." -#: ../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 "Properties checker :" -#: ../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 "This plugin checks for errors in property keys and values." -#: ../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 "Invalid tagchecker line - {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 "Invalid spellcheck line: {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 "" @@ -11711,7 +12676,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 "Illegal tag/value combinations" @@ -11719,80 +12684,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 "Painting problem" -#: ../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 "Key ''{0}'' invalid." -#: ../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 "Tags with empty values" -#: ../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 "Invalid property key" -#: ../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 "Invalid white space in property key" -#: ../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 "Property values start or end with white space" -#: ../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 "Property values contain HTML entity" -#: ../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 "Key ''{0}'' not in presets." -#: ../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 "Presets do not contain property key" -#: ../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 "Value ''{0}'' for key ''{1}'' not in presets." -#: ../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 "Presets do not contain property value" -#: ../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 "Check property keys." -#: ../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 "Validate that property keys are valid checking against list of words." -#: ../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 "Use complex property checker." -#: ../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 "Validate property values and tags using complex rules." +#: ../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 source" -#: ../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." @@ -11802,82 +12767,82 @@ "org/index.php/User:JLS/speller) or tag checking data files." -#: ../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 "Add a new source to the list." -#: ../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 "Edit the selected source." -#: ../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 "Data sources" -#: ../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 "Check property values." -#: ../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 "Validate that property values are valid checking against presets." -#: ../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 "Check for 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 "Looks for nodes or ways with FIXME in any property value." -#: ../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 "Check for paint notes." -#: ../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 "Check if map painting found data errors." -#: ../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 "Use default data file." -#: ../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 "Use the default data file (recommended)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 msgid "Use default tag ignore file." msgstr "Use default tag ignore file." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use the default tag ignore file (recommended)." msgstr "Use the default tag ignore file (recommended)." -#: ../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 "Use default spellcheck file." -#: ../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 "Use the default spellcheck file (recommended)." -#: ../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 "Fix properties" -#: ../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 "Could not find element type" -#: ../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 "Could not find warning level" -#: ../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 "Illegal expression ''{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}''" @@ -12022,7 +12987,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 "building" @@ -12036,5 +13001,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 "area" @@ -12172,5 +13137,5 @@ msgstr "Reached a junction" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Exception occurred" @@ -12237,14 +13202,14 @@ msgstr "WMS Plugin Help" -#: ../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 "Rectified Image..." -#: ../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 "Download Rectified Images From Various Services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12255,26 +13220,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 "Custom WMS Link" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Supported Rectifier Services:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Visit Homepage" -#: ../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 or Image 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 "Add Rectified Image" -#: ../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 " @@ -12284,37 +13249,55 @@ "again." -#: ../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 "No valid WMS URL or id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Adjust 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 "Adjust the position of the selected WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." msgstr "Please select the WMS layer to adjust." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" msgstr "Select WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" msgstr "Start adjusting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 msgid "There are currently no WMS layer to adjust." msgstr "There are currently no WMS layer to adjust." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 msgid "No layers to adjust" msgstr "No layers to adjust" -#: ../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 "" @@ -12329,15 +13312,43 @@ msgstr "Automatic downloading" -#: ../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 "Activate" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS layer ({0}), automatically downloading in zoom {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 layer ({0}), downloading in zoom {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 "Invalid date" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12345,90 +13356,102 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../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}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "File Format Error" -#: ../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 "Open a blank WMS layer to load data from a file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "WMS Plugin Preferences" -#: ../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 "Modify list of WMS servers displayed in the WMS plugin menu" -#: ../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 "Menu Name" -#: ../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 URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Menu Name (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS URL (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Enter a menu name and WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Copy Default" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Copy defaults" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Please select at least one way." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Downloader:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "TCX Files (*.tcx)" #. * @@ -12834,62 +13857,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 "Reference" - -#. 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 "Layer" #. item "Streets/Motorway" combo "Layer" @@ -12904,5 +13872,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 "Lanes" @@ -12917,5 +13885,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" @@ -12925,10 +13892,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 "Max. speed (km/h)" @@ -12972,9 +13939,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 "Oneway" @@ -13022,13 +13989,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 "Bridge" @@ -13070,13 +14037,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 "Tunnel" @@ -13116,12 +14083,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 "Cutting" @@ -13161,12 +14128,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 "Embankment" @@ -13322,17 +14289,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 "Width (metres)" @@ -13359,4 +14326,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" @@ -13375,11 +14343,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 "Surface" @@ -13389,4 +14358,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" @@ -13401,9 +14371,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 "paved" @@ -13411,10 +14382,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 "unpaved" + +#: 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 "Chalet" + +#: 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 "concrete" + +#: 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 "Rental" + +#. 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 "wood" + +#: 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 "parking_tickets" #. item "Ways/Track Grade 2" combo "Surface" @@ -13422,12 +14456,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 "cobblestone" + +#: 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 "gravel" + +#: 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 "cobblestone" + +#: 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 "incomplete" + +#: 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 "grass" + +#: 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 "grass" + +#: 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 "sand" + +#. 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 "ground" #. item "Streets/Residential" text "Width (meters)" @@ -13508,20 +14624,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Road Restrictions" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Edit Road Restrictions" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Toll" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "No exit (cul-de-sac)" @@ -13534,8 +14650,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 "Access" @@ -13570,32 +14686,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 "yes" @@ -13608,40 +14739,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 "private" -#: 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 "designated" @@ -13654,19 +14785,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 "destination" @@ -13689,65 +14820,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 "permissive" -#: 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 "agricultural" -#: 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 "no" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Goods" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Heavy Goods Vehicles (hgv)" @@ -13762,10 +14898,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 "Horse" @@ -13781,17 +14917,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 "Motorcycle" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13803,30 +14938,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 "Motorcar" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Public Service Vehicles (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorboat" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Boat" #. 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 "Min. speed (km/h)" @@ -13834,25 +14969,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 "Max. weight (tonnes)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. Height (metres)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. Width (metres)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. Length (metres)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Roundabout" @@ -13863,5 +14998,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 "Edit Junction" @@ -13877,5 +15012,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" #. @@ -13883,9 +15018,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 "Type" @@ -13905,10 +15040,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 "motorway" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorway_link" @@ -13930,10 +15065,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 "trunk" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "trunk_link" @@ -13955,10 +15090,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 "primary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "primary_link" @@ -13980,5 +15115,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" @@ -13993,9 +15128,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "tertiary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "unclassified" @@ -14009,9 +15144,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "residential" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "living_street" @@ -14041,10 +15176,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 "service" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "bus_guideway" @@ -14074,6 +15209,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 "construction" @@ -14084,10 +15219,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 "Edit Bridge" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Edit Tunnel" @@ -14095,19 +15230,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Ways" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Construction" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Edit Highway Under Construction" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Junction" @@ -14123,5 +15258,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "roundabout" @@ -14130,5 +15265,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Bridleway" @@ -14136,5 +15271,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Edit Bridleway" @@ -14142,5 +15277,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Cycleway" @@ -14150,11 +15285,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 "Edit Cycleway" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Pedestrian" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Footway" @@ -14163,11 +15304,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Edit Footway" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Spikes" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Pedestrian" @@ -14176,5 +15323,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Edit Pedestrian Street" @@ -14182,5 +15329,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Steps" @@ -14190,5 +15337,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 "Edit Flight of Steps" @@ -14197,5 +15344,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Track" @@ -14204,39 +15351,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Edit Track" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "concrete" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "gravel" - -#. 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 "ground" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "grass" - -#: 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 "sand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Track Grade 1" @@ -14245,5 +15364,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Edit Track of grade 1" @@ -14251,5 +15370,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Track Grade 2" @@ -14258,5 +15377,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Edit Track of grade 2" @@ -14264,5 +15383,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Track Grade 3" @@ -14271,5 +15390,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Edit Track of grade 3" @@ -14277,5 +15396,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Track Grade 4" @@ -14284,5 +15403,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Edit Track of grade 4" @@ -14290,5 +15409,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Track Grade 5" @@ -14297,5 +15416,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Edit Track of grade 5" @@ -14304,5 +15423,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Path" @@ -14311,19 +15430,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Edit Path" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Snowmobile" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. 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 "Hiking" @@ -14333,5 +15455,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 "Edit Hiking" @@ -14339,5 +15461,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Mountain Hiking" @@ -14347,5 +15469,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 "Edit Mountain Hiking" @@ -14353,5 +15475,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Demanding Mountain Hiking" @@ -14361,5 +15483,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 "Edit Demanding Mountain Hiking" @@ -14367,5 +15489,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Alpine Hiking" @@ -14375,5 +15497,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 "Edit Alpine Hiking" @@ -14381,5 +15503,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Demanding Alpine Hiking" @@ -14389,5 +15511,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 "Edit Demanding Alpine Hiking" @@ -14395,5 +15517,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Difficult Alpine Hiking" @@ -14403,5 +15525,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 "Edit Difficult Alpine Hiking" @@ -14409,10 +15531,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Waypoints" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Motorway Junction" @@ -14420,15 +15542,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Edit Motorway Junction" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Number" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Services" @@ -14436,5 +15558,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Edit Service Station" @@ -14448,4 +15570,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" #. @@ -14465,18 +15589,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 "Operator" @@ -14485,5 +15611,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Traffic Lights" @@ -14493,5 +15619,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Pedestrian crossing type" @@ -14500,27 +15626,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 "uncontrolled" -#: 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 "traffic_signals" -#: 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 "island" -#: 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 "unmarked" #. 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 "Cross on horseback" @@ -14528,6 +15654,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 "Cross by bicycle" @@ -14536,11 +15662,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 "Crossing attendant" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Crossing type name (UK)" @@ -14548,30 +15674,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 "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelican" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stop" @@ -14579,5 +15705,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Pedestrian Crossing" @@ -14586,14 +15712,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Edit Crossing" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Type name (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-roundabout" @@ -14604,14 +15730,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 "Direction" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "clockwise" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Turning Circle" @@ -14621,20 +15747,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 "City Limit" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Edit City Limit Sign" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Second Name" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Speed Camera" @@ -14642,5 +15768,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Emergency Phone" @@ -14648,5 +15774,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Incline" @@ -14654,5 +15780,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Incline Steep" @@ -14661,10 +15787,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Ford" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Edit Ford" @@ -14672,5 +15798,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Mountain Pass" @@ -14678,5 +15804,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Edit Mountain Pass" @@ -14684,11 +15810,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 "Elevation" @@ -14696,5 +15822,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barriers" @@ -14702,5 +15828,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Bollard" @@ -14708,5 +15834,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Edit Bollard" @@ -14751,16 +15877,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 "Allowed traffic:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Cycle Barrier" @@ -14769,5 +15895,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Block" @@ -14775,5 +15901,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Cattle Grid" @@ -14781,10 +15907,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Edit Cattle Grid" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bus Trap" @@ -14792,15 +15918,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Spikes" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Edit Spikes" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Toll Booth" @@ -14808,5 +15934,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Edit Toll Booth" @@ -14814,10 +15940,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Border Control point" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Edit Border Control point" @@ -14827,5 +15953,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Hedge" @@ -14834,5 +15960,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Fence" @@ -14841,5 +15967,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Wall" @@ -14847,5 +15973,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "City Wall" @@ -14854,5 +15980,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Retaining Wall" @@ -14864,15 +15990,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Entrance" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Edit an Entrance" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Gate" @@ -14880,50 +16006,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Edit Gate" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Lift Gate" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Edit Lift Gate" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Hampshire Gate" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Edit Hampshire Gate" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Bump Gate" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Edit Bump Gate" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Kissing Gate" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Edit Kissing Gate" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Stile" @@ -14931,25 +16057,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Edit Stile" #. 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 "Sally Port" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Edit Sally Port" @@ -14960,10 +16086,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 "Water" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Spring" @@ -14971,5 +16097,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Edit Spring" @@ -14977,5 +16103,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Drain" @@ -14983,10 +16109,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Edit Drain" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Stream" @@ -14994,10 +16120,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Edit Stream" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Canal" @@ -15005,10 +16131,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Edit Canal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "River" @@ -15018,5 +16144,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 "Edit River" @@ -15024,15 +16150,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Edit Water" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Edit Land" @@ -15040,15 +16166,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Basin" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Edit Basin Landuse" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Reservoir" @@ -15056,15 +16182,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Edit Reservoir Landuse" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Covered Reservoir" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Edit Covered Reservoir" @@ -15072,5 +16198,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Riverbank" @@ -15079,10 +16205,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Edit Riverbank" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Wetland" @@ -15093,14 +16219,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 "Edit Wetland" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "swamp" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "bog" @@ -15114,35 +16240,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "marsh" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "reedbed" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "saltmarsh" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "tidalflat" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangrove" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Mud" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Edit Mud" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Beach" @@ -15150,20 +16276,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Edit Beach" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Bay" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Edit Bay" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Cliff" @@ -15171,10 +16297,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Edit Cliff" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Coastline" @@ -15182,5 +16308,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Edit Coastline" @@ -15188,5 +16314,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Ferry Route" @@ -15194,5 +16320,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Edit Ferry" @@ -15201,5 +16327,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Boatyard" @@ -15207,10 +16333,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Edit Boatyard" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dock" @@ -15218,5 +16344,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Edit Dock" @@ -15224,5 +16350,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Dam" @@ -15230,15 +16356,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Edit Dam" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Waterway Point" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Lock Gate" @@ -15247,5 +16373,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Weir" @@ -15253,20 +16379,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Edit Weir" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Waterfall" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Edit Waterfall" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Turning Point" @@ -15275,15 +16401,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Edit Marina" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Pier" @@ -15291,10 +16417,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Edit Pier" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Ferry Terminal" @@ -15302,10 +16428,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Edit Ferry Terminal" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Slipway" @@ -15315,5 +16441,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 "Edit Slipway" @@ -15321,10 +16447,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Railway" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Railway" @@ -15332,5 +16458,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Edit Railway" @@ -15360,8 +16486,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 "Optional Types" @@ -15375,35 +16501,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 "yard" -#: 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 "siding" -#: 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 "spur" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Narrow Gauge Railway" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Edit Narrow Gauge Railway" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15411,45 +16537,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Edit Monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Preserved" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Edit Preserved Railway" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Light Rail" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Edit Light Rail" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Subway" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Edit Subway" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tram" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Edit Tram" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Bus Guideway" @@ -15457,5 +16583,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Edit Bus Guideway" @@ -15464,14 +16590,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Disused Rail" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Edit Disused Railway" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Abandoned Rail" @@ -15480,5 +16606,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Level Crossing" @@ -15487,5 +16613,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Crossing" @@ -15495,5 +16621,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Crossing type" @@ -15501,5 +16627,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Turntable" @@ -15508,10 +16634,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Aerialway" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Chair Lift" @@ -15519,10 +16645,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Edit Chair Lift" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Drag Lift" @@ -15530,10 +16656,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Edit Drag Lift" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Cable Car" @@ -15541,10 +16667,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Edit Cable Car" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Gondola" @@ -15552,5 +16678,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Edit Gondola" @@ -15558,5 +16684,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 "Station" @@ -15567,10 +16693,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 "Edit Station" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Fuel" @@ -15580,9 +16706,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 "Edit Fuel" #. 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 "Opening Hours" + +#. 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" @@ -15602,106 +16957,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Edit Parking" #. 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 "Reference number" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "multi-storey" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "surface" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "underground" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "park_and_ride" + +#. 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 "Fee" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Capacity" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Spaces for Disabled" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Spaces for Disabled" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Spaces for Disabled" + +#: 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 "Wash" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Edit Car Wash" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Shop" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Edit Car Shop" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Repair" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Edit Car Repair" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Rental" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Edit Car Rental" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Sharing" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Edit Car Sharing" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Edit Bicycle Parking" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Capacity" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "surface" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "multi-storey" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "underground" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "park_and_ride" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Spaces for Disabled" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Fee" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Wash" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Edit Car Wash" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Shop" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Edit Car Shop" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Repair" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Edit Car Repair" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Rental" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Edit Car Rental" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Sharing" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Edit Car Sharing" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Edit Bicycle Parking" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Edit Bicycle Rental" @@ -15710,15 +17100,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Edit Bicycle Shop" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Public Transport" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -15726,5 +17116,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Railway Halt" @@ -15732,5 +17122,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Edit Halt" @@ -15738,5 +17128,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tram Stop" @@ -15745,5 +17135,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Edit Tram Stop" @@ -15751,5 +17141,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Railway Platform" @@ -15758,5 +17148,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Edit Railway Platform" @@ -15768,5 +17158,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 "Reference (track number)" @@ -15774,10 +17164,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 "Area" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Subway Entrance" @@ -15786,10 +17176,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Edit Subway Entrance" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Wheelchair" @@ -15798,5 +17188,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Bus Station" @@ -15805,5 +17195,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Edit Bus Station" @@ -15811,5 +17201,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bus Stop" @@ -15819,5 +17209,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 "Edit Bus Stop" @@ -15826,8 +17216,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 "Shelter" @@ -15835,10 +17223,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Bus Platform" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Edit Bus Platform" @@ -15846,5 +17234,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15852,5 +17240,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Edit Taxi station" @@ -15858,5 +17246,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Airport" @@ -15864,15 +17252,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Edit Airport" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15881,5 +17269,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Accomodation" @@ -15891,5 +17279,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -15898,15 +17286,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Edit Hotel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stars" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -15914,20 +17302,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Edit Motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Guest House" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Edit Guest House" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Chalet" @@ -15935,10 +17323,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Edit Chalet" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Hostel" @@ -15946,30 +17334,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Edit Hostel" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Alpine Hut" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Edit Alpine Hut" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Caravan Site" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Edit Caravan Site" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Camp Site" @@ -15977,10 +17365,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Edit Camp Site" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Food+Drinks" @@ -15991,5 +17379,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -15997,5 +17385,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Edit Restaurant" @@ -16003,5 +17391,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 "Cuisine" @@ -16009,61 +17397,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 "italian" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chinese" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "burger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "greek" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "german" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indian" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turkish" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asian" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexican" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japanese" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fast Food" @@ -16071,9 +17459,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Edit Fast Food Restaurant" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Cafe" @@ -16081,10 +17469,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Edit Cafe" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -16092,20 +17479,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Edit Pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Edit Biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16113,10 +17498,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Edit Bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Nightclub" @@ -16124,33 +17508,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Edit Nightclub" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Tourism" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attraction" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Edit Attraction" -#. 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 "Opening Hours" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -16158,10 +17533,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Edit Museum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16170,10 +17544,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Edit Zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Viewpoint" @@ -16181,25 +17554,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Edit Viewpoint" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Look-Out Tower" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Theme Park" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Edit Theme Park" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Artwork" @@ -16207,5 +17579,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Edit Artwork" @@ -16213,86 +17585,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Information Office" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Edit Information Office" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Map" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Map Type" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "map" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "citymap" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "hikingmap" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "bicyclemap" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "street" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chinese" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Download Area" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Paste" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "City" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regional" #. 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 "Closer Description" #. 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 "Cycling" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Mountain Hiking" + +#. 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 "Skiing" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "siding" + +#. 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 "Information Board" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Board Type" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "board" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Border Control point" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "novice" + +#: build/trans_presets.java:1737 msgid "history" msgstr "history" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "nature" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "wildlife" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "landuse" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Guidepost (Hiking)" -#. 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 "Information" + +#. 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 "Closer Description" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Phone Number" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Other Information Points" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Edit Shelter" @@ -16300,25 +17797,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 "Fireplace" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Picnic Site" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Edit Picnic Site" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historic Places" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Castle" @@ -16327,20 +17824,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Edit Castle" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruins" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Edit Ruins" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Archaeological Site" @@ -16349,10 +17845,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Edit Archaeological Site" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Battlefield" @@ -16360,5 +17855,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Edit Battlefield" @@ -16366,15 +17861,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Edit Monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Memorial" @@ -16382,45 +17877,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Edit Memorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Wayside Cross" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Edit Wayside Cross" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Wayside Shrine" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Edit Wayside Shrine" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Leisure" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Water Park" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Edit Water Park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Playground" @@ -16428,15 +17923,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Edit Playground" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Fishing" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Edit Fishing" @@ -16444,15 +17939,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sport Facilities" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadium" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Edit Stadium" @@ -16466,6 +17961,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 "select sport:" @@ -16857,30 +18352,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 "sport" @@ -16890,227 +18385,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 "multi" -#: 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 "archery" -#: 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 "athletics" -#: 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 "australian_football" -#: 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 "baseball" -#: 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 "basketball" -#: 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 "boules" -#: 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 "lawn bowls" -#: 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 "canoeing" -#: 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 "climbing" -#: 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 "cricket" -#: 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 "cricket nets" -#: 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 "croquet" -#: 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 "cycling" -#: 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 "dog racing" -#: 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 "equestrian" -#: 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 "football" -#: 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 "golf" -#: 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 "gymnastics" -#: 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 "hockey" -#: 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 "horse_racing" -#: 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 "motor" -#: 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 "pelota" -#: 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 "racquet" -#: 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 "rugby" -#: 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 "shooting" -#: 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 "skateboard" -#: 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 "skating" -#: 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 "skiing" -#: 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 "soccer" -#: 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 "swimming" -#: 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 "table_tennis" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sports Centre" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Edit Sports Centre" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Pitch" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Edit Pitch" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Racetrack" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Edit Racetrack" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golf Course" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Edit Golf Course" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Miniature Golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Edit Miniature Golf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Multi" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Edit Multi" @@ -17149,248 +18642,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 "pitch" -#: 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 "sports_centre" -#: 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 "stadium" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "10pin" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Edit 10pin" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Athletics" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Edit Athletics" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Archery" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Edit Archery" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Climbing" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Edit Climbing" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Canoeing" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Edit Canoeing" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Cycling" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Edit Cycling" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Dog Racing" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Edit Dog Racing" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Equestrian" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Edit Equestrian" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Horse Racing" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Edit Horse Racing" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastics" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Edit Gymnastics" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motor Sports" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Edit Motor Sports" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skating" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Edit Skating" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Edit Skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Swimming" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Edit Swimming" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Skiing" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Edit Skiing" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Piste type" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "downhill" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "nordic" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snow_park" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Difficulty" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "novice" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "easy" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "intermediate" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "advanced" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "expert" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "freeride" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Shooting" @@ -17398,178 +18883,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Edit Shooting" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Sport (Ball)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Football" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Edit Football" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "American Football" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Edit American Football" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australian Football" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Edit Australian Football" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Edit Baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Edit Basketball" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Edit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Edit Boule" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowls" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Edit Bowls" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Edit Cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricket Nets" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Edit Cricket Nets" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Edit Croquet" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Edit Hockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Edit Pelota" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Racquet" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Edit Racquet" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Edit Rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Table Tennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Edit Table Tennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Edit Tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Buildings" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Building" @@ -17577,5 +19062,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Public Building" @@ -17583,10 +19068,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Edit Public Building" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Town hall" @@ -17594,10 +19079,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Edit Town hall" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Embassy" @@ -17605,10 +19090,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Edit Embassy" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Courthouse" @@ -17617,10 +19102,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Edit Courthouse" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Prison" @@ -17629,10 +19114,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Edit Prison" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Police" @@ -17642,10 +19127,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 "Edit Police" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Fire Station" @@ -17654,10 +19139,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Edit Fire Station" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Post Office" @@ -17665,5 +19150,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Edit Post Office" @@ -17671,15 +19156,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Preschool" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Edit Preschool" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "School" @@ -17687,10 +19172,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Edit School" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "University" @@ -17698,10 +19183,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Edit University" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "College" @@ -17709,5 +19194,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Edit College" @@ -17715,5 +19200,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Cinema" @@ -17722,10 +19207,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Edit Cinema" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Library" @@ -17734,10 +19219,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Edit Library" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Arts Centre" @@ -17745,10 +19229,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Edit Arts Centre" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Theatre" @@ -17757,10 +19241,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Edit Theatre" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Place of Worship" @@ -17770,5 +19254,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 "Edit Place of Worship" @@ -17777,6 +19261,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 "Religion" @@ -17785,66 +19269,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 "bahai" -#: 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 "buddhist" -#: 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 "christian" -#: 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 "hindu" -#: 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 "jain" -#: 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 "jewish" -#: 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 "muslim" -#: 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 "sikh" -#: 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 "spiritualist" -#: 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 "taoist" -#: 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 "unitarian" -#: 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 "zoroastrian" -#: 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 "Denomination" @@ -17853,81 +19337,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 "anglican" -#: 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 "baptist" -#: 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 "catholic" -#: 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 "evangelical" -#: 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 "jehovahs_witness" -#: 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 "lutheran" -#: 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 "methodist" -#: 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 "mormon" -#: 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 "orthodox" -#: 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 "pentecostal" -#: 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 "presbyterian" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Addresses" @@ -17936,5 +19420,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Edit Address Information" @@ -17942,5 +19426,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "House number" @@ -17948,20 +19432,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "House name" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "City name" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Post code" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Country code" @@ -17969,5 +19453,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Address Interpolation" @@ -17976,5 +19460,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Edit Address Interpolation" @@ -17982,71 +19466,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Numbering scheme" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "odd" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "even" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "all" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alphabetic" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Man Made" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Works" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Edit Works" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Tower" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Edit Tower" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Water Tower" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Edit Water Tower" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasometer" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Edit Gasometer" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Lighthouse" @@ -18054,10 +19534,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Edit Lighthouse" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Windmill" @@ -18065,10 +19545,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Edit Windmill" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Pipeline" @@ -18076,10 +19556,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Edit Pipeline" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Sewerage Plant" @@ -18089,10 +19569,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 "Edit Sewerage Plant" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Crane" @@ -18100,10 +19580,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Edit Crane" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Beacon" @@ -18111,10 +19591,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Edit Beacon" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Survey Point" @@ -18122,10 +19602,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Edit Survey Point" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Surveillance" @@ -18133,5 +19613,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Edit Surveillance Camera" @@ -18139,5 +19619,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Power Generator" @@ -18147,39 +19627,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 "Edit Power Generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "coal" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "photovoltaic" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Power Station" @@ -18188,10 +19668,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Edit Power Station" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Power Sub Station" @@ -18200,5 +19680,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Edit Power Sub Station" @@ -18206,10 +19686,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 "Line reference" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Power Tower" @@ -18220,5 +19700,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 "Edit Power Tower" @@ -18226,5 +19706,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Power Line" @@ -18233,46 +19713,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Edit Power Line" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Voltage" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Amount of Wires" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Amenities" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toilets" -#. 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 "Reference number" - #. 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 "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Post Box" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telephone" @@ -18281,5 +19755,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Edit Telephone" @@ -18287,5 +19761,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 "Coins" @@ -18293,5 +19767,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 "Notes" @@ -18299,5 +19773,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 "Electronic purses and Charge cards" @@ -18305,5 +19779,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 "Debit cards" @@ -18311,15 +19785,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 "Credit cards" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telephone cards" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recycling" @@ -18328,5 +19802,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Edit Recycling station" @@ -18334,80 +19808,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Cans" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Clothes" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Paper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Scrap Metal" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Bench" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Hunting Stand" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Edit Hunting Stand" -#. 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 "Height" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "low" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "half" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "full" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Hide" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Lock" -#. 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 "Height" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "low" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "half" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "full" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fountain" @@ -18416,10 +19886,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Edit Fountain" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Drinking Water" @@ -18428,10 +19898,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Edit Drinking Water" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Baby Hatch" @@ -18439,25 +19909,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Edit Baby Hatch" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Shops" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Edit Supermarket" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Chalet" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Edit Chalet" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Convenience Store" @@ -18465,10 +19945,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Edit Convenience Store" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18476,10 +19955,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Edit Kiosk" -#. 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 "Edit Bus Stop" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Edit Tree" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Vending machine" @@ -18487,5 +19985,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Edit Vending machine" @@ -18493,88 +19991,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Vending products" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "food" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "sweets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "toys" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Account or loyalty cards" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Butcher" @@ -18582,10 +20080,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Edit Butcher" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Baker" @@ -18593,10 +20090,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Edit Baker" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Florist" @@ -18604,20 +20100,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Edit Florist" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Organic" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Edit Organic Shop" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Alcohol" @@ -18625,60 +20119,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Edit Alcohol Shop" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Beverages" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Edit Beverages Shop" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Edit Computer Shop" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Electronics" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Edit Electronics Shop" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Edit Hifi Shop" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Furniture" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Edit Furniture Shop" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Garden Centre" @@ -18686,10 +20174,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Edit Garden Centre" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Hardware" @@ -18697,10 +20184,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Edit Hardware Store" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Do-it-yourself-store" @@ -18708,60 +20194,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Edit Do-it-yourself-store" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Stationery" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Edit Stationery Shop" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Hairdresser" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Edit Hairdresser" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Shoes" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Edit Shoe Shop" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Toys" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Edit Toy Shop" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Edit Video Shop" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Dry Cleaning" @@ -18769,10 +20249,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Edit Dry Cleaning" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Laundry" @@ -18780,10 +20259,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Edit Laundry" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Outdoor" @@ -18791,35 +20269,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Edit Outdoor Shop" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sports" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Edit Sports Shop" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optician" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Edit Optician" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Cash" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -18827,16 +20302,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Edit Bank" -#. 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 "Automated Teller Machine" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Money Exchange" @@ -18844,5 +20317,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Edit Money Exchange" @@ -18850,15 +20323,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Edit Automated Teller Machine" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Health" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Doctors" @@ -18866,20 +20339,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Edit Doctors" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dentist" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Edit Dentist" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Pharmacy" @@ -18887,5 +20358,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Edit Pharmacy" @@ -18893,10 +20364,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Dispensing" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Hospital" @@ -18904,10 +20374,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Edit Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Emergency Access Point" @@ -18916,5 +20386,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Edit Emergency Access Point" @@ -18923,20 +20393,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Point Number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Point Name" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Phone Number" #. 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 "(Use international code, like +12-345-67890)" @@ -18944,5 +20414,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 "Veterinary" @@ -18951,55 +20421,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Edit Veterinary" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Edit Continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Country" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Edit Country" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "State" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Edit State" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Edit Region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "County" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Edit County" @@ -19007,15 +20477,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "City" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Edit City" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Town" @@ -19023,10 +20493,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Edit Town" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Suburb" @@ -19034,25 +20504,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Edit Suburb" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Edit Village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Hamlet" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Edit Hamlet" @@ -19060,5 +20530,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Locality" @@ -19066,10 +20536,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Edit Locality" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Island" @@ -19077,11 +20547,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Edit Island" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "left" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Edit Chalet" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Cave Entrance" @@ -19089,10 +20572,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Edit Cave Entrance" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Peak" @@ -19100,10 +20583,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Edit Peak" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Glacier" @@ -19111,10 +20594,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Edit Glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Volcano" @@ -19122,70 +20605,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Edit Volcano" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Boundaries" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "National" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Edit National Boundary" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Edit Administrative Boundary" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Edit Civil Boundary" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Political" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Edit Political Boundary" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "National park" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Edit National Park Boundary" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Land use" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Tree" @@ -19194,15 +20677,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Edit Tree" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanical Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Wood" @@ -19211,5 +20694,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Edit Wood" @@ -19217,17 +20700,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 "coniferous" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Forest" @@ -19236,14 +20719,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Edit Forest Landuse" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Nature Reserve" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Edit Nature Reserve" @@ -19251,25 +20734,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Scree" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Edit Scree" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Scrub" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Edit Scrub" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Fell" @@ -19277,10 +20760,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Edit Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Heath" @@ -19288,5 +20771,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Edit Heath" @@ -19294,5 +20777,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Farmyard" @@ -19301,45 +20784,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Edit Farmyard Landuse" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Farmland" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Edit Farmland Landuse" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Meadow" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Edit Meadow Landuse" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vineyard" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Edit Vineyard Landuse" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Allotments" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Edit Allotments Landuse" @@ -19347,25 +20830,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Garden" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Edit Garden" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Grass" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Edit Grass Landuse" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Village Green" @@ -19373,10 +20856,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Edit Village Green Landuse" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Common" @@ -19384,20 +20867,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Edit Common" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Edit Park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Recreation Ground" @@ -19405,5 +20888,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Edit Recreation Ground Landuse" @@ -19411,15 +20894,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Residential area" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Edit Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Graveyard" @@ -19427,9 +20910,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Edit Graveyard" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cemetery" @@ -19437,39 +20920,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Edit Cemetery Landuse" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Retail" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Edit Retail Landuse" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Commercial" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Edit Commercial Landuse" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Edit Industrial Landuse" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Railway land" @@ -19477,15 +20960,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Edit Railway Landuse" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Military" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Edit Military Landuse" @@ -19493,55 +20976,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Construction area" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Edit Construction Landuse" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Brownfield" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Edit Brownfield Landuse" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Greenfield" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Edit Greenfield Landuse" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Landfill" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Edit Landfill Landuse" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Quarry" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Edit Quarry Landuse" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19551,5 +21034,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 "Edit Multipolygon" @@ -19558,10 +21041,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "outer segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "inner segment" @@ -19569,5 +21052,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Turn restriction" @@ -19576,5 +21059,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Edit Turn Restriction" @@ -19582,34 +21065,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "no left turn" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "no right turn" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "no straight on" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "no U turn" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "only turn right" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "only turn left" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "only straight on" @@ -19618,15 +21101,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "from way" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "via node or way" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "to way" @@ -19634,5 +21117,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Route" @@ -19641,5 +21124,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Edit Route" @@ -19647,5 +21130,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Route type" @@ -19717,5 +21200,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 @@ -19724,17 +21207,17 @@ msgstr "bicycle" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "road" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19787,5 +21270,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 @@ -19794,13 +21277,13 @@ msgstr "foot" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "hiking" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "detour" @@ -19814,10 +21297,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "subway" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Symbol description" @@ -19825,31 +21308,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Network" #. 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 "proposed" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternate" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporary" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "connection" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Colour (hex)" @@ -19858,30 +21341,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "route segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "forward segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "backward segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "halt point" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "forward halt point" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "backward halt point" @@ -20319,11 +21802,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 "deprecated" @@ -20649,41 +22132,4 @@ msgid "motorroad" msgstr "motorroad" - -#. 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 "street" #. color street @@ -22384,5 +23830,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 "light_water" @@ -22981,55 +24427,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23043,5 +24440,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 "tourism" @@ -23113,8 +24510,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 "historic" @@ -23185,8 +24582,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 "green" @@ -23200,5 +24597,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "quarry" @@ -23212,5 +24609,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "landfill" @@ -23232,5 +24629,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "basin" @@ -23244,5 +24641,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "forest" @@ -23256,5 +24653,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "farmyard" @@ -23277,5 +24674,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "retail" @@ -23289,5 +24686,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industrial" @@ -23301,5 +24698,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "brownfield" @@ -23313,5 +24710,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "greenfield" @@ -23325,5 +24722,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "railland" @@ -23380,7 +24777,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 "military" @@ -23394,5 +24791,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cemetery" @@ -23405,5 +24802,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "peak" @@ -23418,5 +24815,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "glacier" @@ -23430,5 +24827,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "volcano" @@ -23483,8 +24880,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 "natural" @@ -23498,5 +24895,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "scrub" @@ -23510,20 +24907,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "heath" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "wood" - #. color water #. 1 @@ -23534,5 +24919,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "mud" @@ -23546,5 +24931,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "beach" @@ -23622,8 +25007,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 "route" @@ -23671,7 +25056,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 "boundary" @@ -23813,10 +25198,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 "place" @@ -23864,6 +25258,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 "address" @@ -24160,9 +25554,160 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Select Tableau d'Assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Adjust the position of the WMS layer (raster images only)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Hint: Some changes came from uploading new data to the server." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Please select ways with almost right angles to orthogonalise." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." + +#~ msgid "No document open so nothing to save." +#~ msgstr "No document open so nothing to save." + +#~ msgid "Change {0} {1}" +#~ msgstr "Change {0} {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Delete {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Remove relation member {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Cannot open preferences directory: {0}" + +#~ msgid "nodes" +#~ msgstr "nodes" + +#~ msgid "ways" +#~ msgstr "ways" + +#~ msgid "relations" +#~ msgstr "relations" + +#~ msgid "changesets" +#~ msgstr "changesets" + +#~ msgid "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" +#~ msgstr "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" + +#~ msgid "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" +#~ msgstr "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" + +#~ msgid "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" +#~ msgstr "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Failed to load history from the server. Details:
{0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" + +#~ msgid "Delete Layer" +#~ msgstr "Delete Layer" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Do you really want to delete layer ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Delete all" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Deleting layer {0} of {1}" + +#~ msgid "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" + +#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" +#~ msgstr "Warning: failed to put dialog always on top. Exception was: {0}" + +#~ msgid "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Authors: {0}" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" + +#~ msgid "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" + +#~ msgid "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" +#~ msgstr "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" + +#~ msgid "Public" +#~ msgstr "Public" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Selected makes your trace public in openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading." + +#~ msgid "Continue anyway" +#~ msgstr "Continue anyway" + +#~ msgid "Copy Default" +#~ msgstr "Copy Default" + +#~ msgid "Edit Information Office" +#~ msgstr "Edit Information Office" + +#~ msgid "Map Type" +#~ msgstr "Map Type" + +#~ msgid "map" +#~ msgstr "map" + +#~ msgid "citymap" +#~ msgstr "citymap" + +#~ msgid "hikingmap" +#~ msgstr "hikingmap" + +#~ msgid "bicyclemap" +#~ msgstr "bicyclemap" + +#~ msgid "Board Type" +#~ msgstr "Board Type" + +#~ msgid "board" +#~ msgstr "board" #~ msgid "Move" @@ -24171,7 +25716,4 @@ #~ msgid "Data Layer" #~ msgstr "Data Layer" - -#~ msgid "Not implemented yet." -#~ msgstr "Not implemented yet." #~ msgid "Unknown file extension." @@ -24504,4 +26046,7 @@ #~ msgstr "sports" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Select Tableau d'Assemblage" + #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -24722,4 +26267,7 @@ #~ msgstr "Didn't find an historized primitive with id {0} in this dataset" +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Adjust the position of the WMS layer (raster images only)" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Failed to initialise API. Please try again later." @@ -24728,7 +26276,4 @@ #~ msgstr "API initialisation failed" -#~ msgid "image loading..." -#~ msgstr "image loading..." - #~ msgid "No data" #~ msgstr "No data" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 17484) +++ /applications/editors/josm/i18n/po/es.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-04 11:10+0000\n" -"Last-Translator: cdavila \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-01 16:33+0000\n" +"Last-Translator: Jesús Gómez Fernández \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Creando la interfaz principal de usuario" #. 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 "Ayuda" -#: ../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 "No se ha podido activar la proyección {0}. Se usará Mercator." - -#: ../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 +msgstr "No se ha podido activar la proyección {0}. Usando Mercator." + +#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Error" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor." - -#: ../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] "Existen cambios sin guardar. ¿Desea descartarlos y continuar?" +msgstr[1] "Existen cambios sin guardar. ¿Desea descartarlos y continuar?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Cambios no guardados" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Existen cambios sin guardar. ¿Desea descartarlos y continuar?" - -#: ../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 "Guardar y salir" -#: ../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 "Descartar y salir" -#: ../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 "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" -msgstr "Ignorando URL mal formada: \"{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 +msgstr "Ignorando URL mal formado: \"{0}\"" + +#: ../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 "Advertencia" -#: ../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 "Ignorando URL de archivo malformado: \"{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 "No puede leerse el archivo ''{0}''. El error es:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -295,5 +305,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" -msgstr "Sitio web" +msgstr "Página principal" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 @@ -306,5 +316,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" @@ -313,5 +323,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" -msgstr "Léeme" +msgstr "Léame" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 @@ -328,6 +338,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 "Complementos" @@ -339,20 +349,31 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." -msgstr "No se ha podido encontrar el archivo." +msgstr "El archivo no se encuentra." #: ../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}''" -msgstr "" -"WARNING: unexpected format of API base URL. Redirection to history page for " -"OSM primitive will probably fail. API base URL is: ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +#, 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 "" +"ADVERTENCIA: el formato inesperado de API base URL. Re dirección a la página " +"de historia para OSM primitivo probablemente fallará . Los API base URL es: " +"\"{0}\"" + +#: ../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 "" +"ADVERTENCIA: el formato inesperado de API base URL. Re dirección a la página " +"de historia para OSM primitivo probablemente fallará . Los API base URL es: " +"\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -360,20 +381,22 @@ "primitives only" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +"ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez {0} " +"de {1} solo seleccionados primitivos" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Please select the target layer." -msgstr "" +msgstr "Por favor, selecciona la capa objetivo." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +msgstr "Seleccionar la capa objetivo" + +#: ../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 +msgstr "Unir" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -381,8 +404,9 @@ "" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +"No hay capas de capa fuente
\"{0}\"
podría ser unida a." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" -msgstr "" +msgstr "Ninguna capas de objetivo" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -394,14 +418,14 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." -msgstr "Añadir nodo definiendo latitud y longitud." +msgstr "Añadir nodo entrando latitud y longitud." #: ../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 @@ -430,5 +454,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 "Latitud" @@ -437,30 +461,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 "Longitud" +#: ../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 "Alinear nodos en círculo" -#: ../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 "Mover los nodos seleccionados a un círculo" -#: ../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 @@ -474,6 +498,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 @@ -481,58 +505,57 @@ msgstr "Herramienta: {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 "Por favor, selecciona al menos cuatro nodos." #. 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 "Información" #. 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 "Alinear nodos en línea recta" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +msgstr "Alinear nodos en línea" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 msgid "Move the selected nodes in to a line." -msgstr "Mover los nodos seleccionados en una línea." - -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +msgstr "Mover los nodos seleccionados a una línea." + +#: ../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 "Por favor selecciona como mínimo tres nodos" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +msgstr "Por favor seleccione como mínimo tres nodos." + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -540,13 +563,13 @@ "{0}, max is {1}" msgstr "" -"El número de cambios actuales supera el máximo de modificaciones permitidas, " -"el actual es {0}, el máximo es {1}" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 +"El número de modificaciones actuales supera el máximo de modificaciones, el " +"actual es {0}, el máximo es {1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 msgid "API Capabilities Violation" msgstr "Violación de la capacidades del API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -554,8 +577,8 @@ "{1}" msgstr "" -"Advertencia: truncar automáticamente el valor de la etiqueta \"{0}\" en la " -"primitiva suprimida {1}" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +"Advertencia: automáticamente truncando el valor de la etiqueta \"{0}\" en " +"la primitiva suprimida {1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -563,49 +586,49 @@ "length {2}. Values length is {3}." msgstr "" -"La longitud del paralo para la etiqueta \"{0}\" en la primitiva {1} excede " -"la máxima longitud permitida {2}. Los valores de longitud son {3}." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +"La longitud del valor para la etiqueta \"{0}\" en la primitiva {1} excede la " +"máxima longitud permitida {2}. Los valores de longitud son {3}." + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Violación de la condición previa" -#: ../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} nodos en vía {1} superar el máximo número permitido de nodos {2}" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +msgstr "{0} nodos en vía {1} supera el máximo número permitido de nodos {2}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "selección" -#: ../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 "conflicto" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "descargar" +#: ../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 "Zoom a {0}" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 +msgstr "Aumente a {0}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom the view to {0}." msgstr "Aumentar la vista a {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 @@ -615,22 +638,22 @@ msgstr "Vista: {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 "No hay nada seleccionado a lo que hacer zoom." - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +msgstr "Nada seleccionado para aumentar" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "No conflicts to zoom to" -msgstr "No hay conflictos sobre los que acercarse" - +msgstr "No hay conflictos para aumentar" + +#: ../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 "Combinar vía" -#: ../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 "Combinar varias vías en una." -#: ../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 "Por favor, selecciona al menos dos vías para combinar." @@ -641,4 +664,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Combinar de todos modos" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -647,19 +674,7 @@ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Combinar de todos modos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "¿Cambiar direcciones?" - -#: ../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 "" -"No se pueden combinar las vías con sus direcciones actuales. ¿Desea invertir " -"alguna de ellas?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -667,27 +682,34 @@ msgstr "Invertir y combinar" -#: ../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 "" +"No se pueden combinar las vías con sus direcciones actuales. ¿Desea invertir " +"alguna de ellas?" + +#: ../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 "Introduzca valores para todos los conflictos." -#: ../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 "Resolver conflictos" -#: ../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 "Combinar {0} vías" -#: ../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 "Todas la vías están vacías" -#: ../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 " @@ -697,32 +719,32 @@ "única de nodos)" +#: ../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 "Copiar" -#: ../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 "Copia los objetos seleccionados al portapapeles" -#: ../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 "Por favor, seleccione algo que copiar." +#: ../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 "Crear círculo" -#: ../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 "Crear un círculo a partir de tres nodos." -#: ../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 "Los nodos no se encuentrar en un círculo. Abortando." + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -734,20 +756,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 "Borrar" @@ -757,26 +779,26 @@ msgstr "Eliminar objetos seleccionados." -#: ../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 "Sobrescribir" -#: ../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 "El archivo existe. ¿Sobrescribir?" #. 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 "Distribuir nodos" -#: ../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 "" @@ -784,60 +806,62 @@ "línea." +#: ../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 "Descargar desde 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 "Descargar datos del mapa del servidor 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 "Archivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Descargar" -#: ../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 "Por favor, seleccione al menos una tarea para descargar" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Descargando referencias desde 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 +"Descargando primitivas referenciando a una de la primitivas seleccionadas" + +#: ../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 +msgstr "Referencias descargadas...." + +#: ../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 "Existió {0} conflictos durante la importación." -#: ../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 "Conflictos durante la descarga" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -846,6 +870,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 "Duplicar" @@ -869,85 +893,91 @@ msgstr "Salir de la aplicación" +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Todas las imágenes" + +#: ../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 "Exportar a 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 "Exportar los datos a archivo 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 "Nada que exportar. Obtén algunos datos primero" -#: ../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 "el parametro \"{0}\" no debe ser nulo" -#: ../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 "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{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 "Exportar archivo GPX" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Ayuda en línea de 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 "Abrir en el navegador" -#: ../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 "Editar" -#: ../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 "Recargar" -#: ../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 "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM" -#: ../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 "Error mientras se cargaba la página {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." msgstr "Falta la página de ayuda. Créela en english." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -997,28 +1027,32 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "Unir capa" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - +msgstr "Unir la capar actual en otrar capa" + +#: ../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 "Unir nodos" -#: ../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 "Unir nodos en el más antiguo." -#: ../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 "Por favor seleccione por lo menos dos nodos para unir." -#: ../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 "¿Unir nodos con diferentes relaciones?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Unir de todos modos" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1028,9 +1062,5 @@ "quiere unirlos?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Unir de todos modos" - -#: ../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 "" @@ -1038,69 +1068,69 @@ "uso." -#: ../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 "Unir {0} nodos" +#: ../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 "Unir la selección" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" -msgstr "" - +msgstr "Unir la primitiva seleccionada actual en otra capa" + +#: ../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 "Invertir" -#: ../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 "Invertir los nodos y vías seleccionadas" -#: ../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 "Por favor, seleccione al menos un nodo o vía" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "arriba" -#: ../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 "Mover objetos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "abajo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "Izquierda" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "derecha" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Mover {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 "Mover objetos {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 "Imposible mover objetos fuera del mundo." @@ -1108,5 +1138,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 "Nuevo" @@ -1116,17 +1146,22 @@ msgstr "Crear un nuevo mapa." -#: ../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 "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Abrir un archivo." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Abrir un archivo." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Rol ''{0}'' desconocido." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1164,22 +1199,18 @@ msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Solo se permiten dos nodos" -#: ../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 "La selección debe consistir solo en vías." -#: ../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 "" "Por favor, seleccione una o más vías cerradas de al menos cuatro nodos." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." - -#: ../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 " @@ -1187,10 +1218,14 @@ "projection to get rid of this warning.
Do you want to continue?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +"Está usando el proyecto EPSG:4326 el cual podría dar lugar
a " +"indeseables resultados cuando haga alineamientos rectangulares.
Cambie su " +"proyección para conseguir eliminar esta advertencia.
¿Desea continuar?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Solo hay un nodo seleccionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -1206,15 +1241,28 @@ msgstr "Pegar los contenidos de la memoria de pegado" -#: ../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 "Pegar etiquetas" -#: ../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 "" "Aplicar las etiquetas guardadas en la memoria de pegado a todos los " "elementos seleccionados" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Cargando {0}" +msgstr[1] "Cargando {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Deshacer borrado de {0} primitivas" +msgstr[1] "Deshacer borrado de {0} primitivas" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1240,37 +1288,32 @@ msgstr "Restaurar la última acción deshecha" -#: ../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 "Cambiar nombre de la capa" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "También cambiar nombre del archivo" -#: ../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 "" - +msgstr "No se puede reombrar el archivo ''{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 "Cambiar el sentido de las vías" -#: ../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 "Invertir el sentido de todas las vías seleccionadas." -#: ../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 "Por favor seleccione por lo menos una vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Cambiar el sentido de las vías" @@ -1278,10 +1321,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 "Guardar" #: ../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 "Guardar los datos actuales." @@ -1292,37 +1336,25 @@ msgstr "El archivo {0} existe. ¿Sobrescribir?" -#: ../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 "" -"Error interno: no se pueden comprobar las condiciones para ninguna capa. Por " -"favor comunique esto como fallo." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Ningún documento abierto luego nada por grabar." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +msgstr "No se ecnotró exportador. Nada guardado." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Documento vacío" -#: ../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 "El documento no contiene datos." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Guardar igualmente" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflictos" -#: ../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 " @@ -1332,28 +1364,28 @@ "gestionarán como si rechazara todo. ¿Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Rechazar conflictos y guardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Guardar el archivo OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Guardar el archivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Guardar capa" +#: ../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 "Guardar como..." -#: ../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 "Guardar los datos actuales en un nuevo archivo." @@ -1388,33 +1420,33 @@ msgstr "Ayuda: : {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Informe de estado" -#: ../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 "Copiar al portapapeles y cerrar" -#: ../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 "Cerrar" +#: ../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 "Separar vía" -#: ../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 "Separar vía por el nodo seleccionado" -#: ../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 "La selección actual no se puede usar para separar." -#: ../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." @@ -1422,5 +1454,5 @@ msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía" -#: ../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 " @@ -1436,9 +1468,9 @@ "seleccione la vía también." -#: ../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 "Los nodos seleccionados no comparten la misma vía." -#: ../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." @@ -1446,10 +1478,10 @@ msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados." -#: ../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 "Debe seleccionar dos o más nodos para dividir una vía circular." -#: ../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 " @@ -1459,20 +1491,50 @@ "nodos de la mitad de la vía)." -#: ../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 " "should verify this and correct it when necessary." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +"Una parte basada en la relación de miembros fue copiada a todas las " +"rutas.
Debería verificar esto y corregirlo cuando sea necesario." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 msgid "" "A relation membership was copied to all new ways.
You should verify " "this and correct it when necessary." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358 +"Una relación de miembros fue copiada a todas las rutas.
Deberería " +"verificar y corregirlo cuando sea necesareo." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 #, java-format msgid "Split way {0} into {1} parts" msgstr "Dividir la vía {0} en {1} partes" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Cerrando conjunto de cambios..." + +#: ../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 "Cerrando conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "No existe alctualmente ningua capa WMS que ajustar." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Abriendo conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Cerrando conjunto de cambios..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1490,56 +1552,56 @@ msgstr "Cambiar de estado el ajuste global ''{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 "Despegar vías" -#: ../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 "Duplicar nodos usados por varias vías." -#: ../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 "Este nodo no está pegado a ninguna otra cosa." -#: ../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 "Ninguno de éstos nodos está pegado a ninguna otra cosa." -#: ../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 "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa." -#: ../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 "La selección actual no se puede usar para despegar." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Selecione alguno:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, o" -#: ../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 "* Un nodo que sea usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* Un nodo usado por más de una vía y una de esas vías, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Una vía que tenga un nodo o más usado por más de una vía, o" -#: ../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." msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía." -#: ../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" @@ -1553,9 +1615,9 @@ "seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nodo despegado" -#: ../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" @@ -1563,5 +1625,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" @@ -1606,62 +1668,72 @@ "Actualiza la actual capa de datos desde el servidor (re-descargas de datos)" -#: ../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 "Actualizando datosd" + +#: ../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 "Actualización de datos no encontrada" + +#: ../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 "No encontró sencillo id{0} en el conjunto de datos actual" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Actualización de selección" -#: ../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 "Actualiza las primitivas seleccionadas actualmente desde el servidor" -#: ../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 "No hay primitivas seleccionadas para actualizar" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Selección vacía" -#: ../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 "Subir a 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 "Subir todos los cambios al servidor 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 "" +"Existen algunos conflictos sin resolver. Tienes que solucionarlos primero." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algunos datos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "" -"Existen algunos conflictos sin resolver. Tienes que solucionarlos primero." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Ningún cambio que subir" -#: ../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 "Sincronizar {0} {1} únicamente" -#: ../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 "Sincronizar el conjunto de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1683,17 +1755,17 @@ "continuar editando.
" -#: ../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 "Conflicto detectado" #. 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 "Retorno de valor inexperado. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1709,5 +1781,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}\"" @@ -1716,59 +1788,148 @@ "\"{1}\"" -#: ../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 "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{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 "Subida fallida.
{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 "Subida a la API de OSM fallida" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Actualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "¿Subir estos cambios?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Subir cambios" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Editar una nueva relación en la capa \"{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 "Añadir un nodo nuevo a una vía existente" + +#: ../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 "subir todos los cambios en una petición" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " "changed primitive" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +"Permitir subir todos los cambios en una petición, no permitir usar una " +"petición por cambio sencillo" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Ajustes del mapa" + +#: ../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 "conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objetos que añadir:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objetos que modificar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objetos que borrar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "¿Subir estos cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Subir cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Subiendo" +#: ../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] "Objetos que añadir:" +msgstr[1] "Objetos que añadir:" + +#: ../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] "Objetos que modificar:" +msgstr[1] "Objetos que modificar:" + +#: ../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] "Objetos que borrar:" +msgstr[1] "Objetos que borrar:" + +#: ../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 "Último cambio en {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1792,20 +1953,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 "Audio: {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 "Más rápido" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Avance rápido" @@ -1847,10 +2008,10 @@ msgstr "Reproducir marcador anterior" -#: ../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 "Más lento" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Avance lento" @@ -1877,32 +2038,29 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 +"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 msgid "No data imported." msgstr "No se importó ningún dato." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Datos 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 "Descargando {0} de {1} ({2} pendientes)" -#: ../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 +msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 msgid "Errors during Download" msgstr "Errores durante la descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1920,20 +2078,20 @@ "
" -#: ../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 "Primitivas movidas o borradas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Modo de borrado" -#: ../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 "Borrar nodos o vías." -#: ../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 @@ -1942,5 +2100,5 @@ msgstr "Modo: {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 " @@ -1950,55 +2108,69 @@ "los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos." -#: ../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 "el parámetro ''{0}'' no debe ser nulo" +#: ../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 "Dibujar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Dibujar nodos" -#: ../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 "Modo: Dibujar foco" -#: ../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 @@ -2006,38 +2178,38 @@ msgstr "seleccionado" -#: ../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 "No se puede añadir un nodo fuera del mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Añadir nodo" -#: ../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 "Añadir nodo a la vía" -#: ../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 "Conectar la vía existente al nodo" -#: ../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 "Añadir un nodo nuevo a una vía existente" -#: ../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 "Añadir un nodo a la vía y conectar" -#: ../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 "Crear un nodo nuevo." -#: ../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 "Seleccionar el nodo bajo el cursor." -#: ../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." @@ -2046,14 +2218,14 @@ msgstr[1] "Insertar un nuevo nodo en {0} vías." -#: ../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 "Comenzar una nueva vía desde el último nodo." -#: ../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 "Continuar la vía desde el último nodo." -#: ../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 "Finalizar dibujo." @@ -2073,5 +2245,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 "" @@ -2084,5 +2256,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 "Soltar el botón del ratón para parar de rotar." @@ -2101,17 +2273,18 @@ "en ese punto." +#: ../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 "Seleccionar" -#: ../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 "Seleccionar, mover y rotar objetos" -#: ../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" @@ -2120,13 +2293,21 @@ msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Mover elementos" -#: ../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 "Moverlos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Deshacer mover" + +#: ../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 "" @@ -2135,13 +2316,9 @@ "¿Quiere moverlos realmente?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Moverlos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Deshacer mover" - -#: ../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." @@ -2150,5 +2327,5 @@ "más cercano." -#: ../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-" @@ -2175,60 +2352,60 @@ "abajo, derecha; mover el zoom con el botón derecho" +#: ../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 "Buscar ..." -#: ../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 "Búsqueda de objetos." -#: ../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 +msgstr "No se puede buscar porque no hay datos cargados." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65 msgid "Please enter a search string." msgstr "Por favor, introduzca una cadena de búsqueda." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "reemplazar selección" -#: ../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 "añadir a la selección" -#: ../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 "eliminar de la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "distinguir mayúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "expresión regular" -#: ../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 "Calle Mayor - 'Calle' y 'Mayor' en cualquier clave o valor." -#: ../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 "\"Calle Mayor\" - 'Calle Mayor' en cualquier clave o nombre." -#: ../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:May - 'May' en cualquier parte del nombre." -#: ../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 - clave 'type' con el valor exacto '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, " @@ -2238,17 +2415,17 @@ "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:May - sin 'May' en el nombre." -#: ../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: - cualquier valor presente en clave=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 "Búsquedas especiales:" -#: ../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)" @@ -2257,34 +2434,35 @@ "relation)" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "user:... - all objects changed by user" +msgstr "" +"user:... - todos los objetos modificados por un determinado usuario" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "user:... - all objects changed by user" -msgstr "" -"user:... - todos los objetos modificados por un determinado usuario" +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objetos con un ID determinado" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objetos con un ID determinado" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objetos con un determinado número de nodos" -#: ../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 - todos los objetos modificados" -#: ../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 - todos los objetos seleccionados" -#: ../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 - todos los objetos incompletos" -#: ../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 "untagged - todos los objetos sin etiquetar" -#: ../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" @@ -2293,5 +2471,5 @@ "la expresión" -#: ../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" @@ -2300,5 +2478,5 @@ "cumplan la expresión" -#: ../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 "" @@ -2306,51 +2484,51 @@ "lógico O (disyunción)" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" -msgstr "Usar ( and ) para agrupar expresiones" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +msgstr "Usar ( y ) para agrupar expresiones" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../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 "No se encontraron coincidencias para \"{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 "No se ha añadido nada a la selección al buscar \"{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 "No se ha quitado nada de la selección al buscar \"{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 "Se han encontrado {0} coincidencias" -#: ../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" @@ -2421,58 +2599,96 @@ msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Cargar selección" -#: ../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 "Contacto {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Descargando..." -#: ../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 "Imposible leer desde la URL: \"{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 "Error de análisis sintáctico en URL: \"{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 "Error mientras se comunicaba con el servidor" -#: ../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 "Añadir nodo" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Añadir {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "Cambiar {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/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relaciones: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Conjunto de cambios {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Conjunto de cambios {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Cambiar relación" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Eliminar \"{0}\" de {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Eliminar \"{0}\" de {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 "Eliminar \"{0}\" de {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Establecer {0}={1} para {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 "Establecer {0}={1} para {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Establecer {0}={1} para {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" @@ -2481,10 +2697,10 @@ msgstr[1] "objetos" -#: ../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 "Eliminar \"{0}\" de {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}" @@ -2496,5 +2712,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2503,10 +2719,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 "Doble conflicto" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2515,8 +2731,8 @@ 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}''" -msgstr "" +msgstr "Añadir conflicto para ''{0}''" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 @@ -2539,24 +2755,46 @@ msgstr "no se puede resolver los conflictos pendientes" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {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] "Borrar {0} {1}" +msgstr[1] "Borrar {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] "Modo de borrado" +msgstr[1] "Modo de borrado" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Borrar {0} {1}" +msgstr[1] "Borrar {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] "Borrar de la relación" +msgstr[1] "Borrar de la relación" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relación con conclicto" -#: ../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 "Borrar de la relación" + +#: ../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 "" "La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol " @@ -2564,20 +2802,14 @@ "¿Borrar de la relació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 "Borrar de la relación" - -#: ../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 "" "La selección \"{0}\" está siendo usada por la relación \"{1}\".\n" "¿Borrar de la relación?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Dividir segmento de vía" @@ -2585,6 +2817,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." @@ -2596,7 +2828,7 @@ "usándolos.
¿Esta seguro que quiere borrarlo?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" -msgstr "" +msgstr "Confirmación antes de borrar" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 @@ -2605,10 +2837,10 @@ msgstr "Resolver los conflictos en el estado de borrado en {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" msgid_plural "Move {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Mover {0} nodo" +msgstr[1] "Mover {0} nodos" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 @@ -2640,15 +2872,25 @@ msgstr "Resolver conflictos en la lista de miembros de la relación {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Eliminando miembro de relación {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" msgid_plural "Rotate {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Rotar {0} nodo" +msgstr[1] "Rotar {0} nodos" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 @@ -2656,17 +2898,37 @@ msgstr "Secuencia" -#: ../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 "Resolver {0} conflictos de etiquetas en {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 "Resolver {0} conflictos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Resolver {0} conflictos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Deshacer borrado de {0} primitivas" -#: ../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 "Resolver conflictos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Resolver conflictos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Resolver conflictos de versión para {0} {1}" @@ -2694,13 +2956,13 @@ "de los datos." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relación" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Rol antiguo" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Rol nuevo" @@ -2719,64 +2981,121 @@ #: ../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 "Nuevo valor" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Aplicar los cambios seleccionados" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "No aplicar cambios" -#: ../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 "Por favor, seleccione qué cambios de propiedades desea aplicar." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Propiedades de " -#: ../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 "Roles en la relaciones referidos a" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Correción automática de etiquetas" -#: ../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 "Archivo de configuración malformado en las lineas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "No se puede abrir el directorio de preferencias: {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 "" "El archivo de preferencias contiene errores. Realizando copia de seguridad " "de uno antiguo a {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 "Preferencias guardadas en {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 "No se han podido subir las preferencias. Ya que: {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 "No se han podido cargar las preferencias desde el servidor." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2790,32 +3109,39 @@ msgstr "ya se ha registrado un conflicto para la primitiva \"{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 "Grados decimales" -#: ../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 "Grados minutos segundos" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../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}" -msgstr "" +msgstr "Conjunto de cambios {0}" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 @@ -2824,15 +3150,236 @@ msgstr "parámetro {0} > 0 necesario. Obtenido {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 "incompleto" - -#: ../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 "Error: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Advertencia: {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 "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{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 "No existe una primitiva con la versión {0} en este historial" + +#: ../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 "No hay ninguna versión válida en la fecha ''{0}'' en este historial" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "ninguna versión más antigua encontrada. El histórico está vacío." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "no se encontró ninguna versión más reciente. El histórico está vacío." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "No se encontró ninguna primitiva con ID {0} en este conjunto de datos" + +#: ../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 "" +"No se encontró ninguna primitiva con ID {0} y versión {1} en este conjunto " +"de datos" + +#: ../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 "parámetro \"{0}\" > 0 esperado, obtenido \"{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 "" +"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con 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 "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Vía de tipo área sin cerrar" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "La vía multipoligonal ''{0}'' no está cerrada." + +#. 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 "Miembro vacío en la relación." + +#: ../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 "Miembro ''{0}'' borrado en la relación." + +#: ../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 "Vía ''{0}'' con menos de dos puntos." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Se ha encontrado más de una vía \"desde\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Se ha encontrado más de una vía \"a\"." + +#: ../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 "Se ha encontrado más de un elemento \"vía\"." + +#: ../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 "Rol ''{0}'' desconocido." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Tipo de miembro \"{0}\" desconocido." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "No se ha encontrado ninguna vía \"desde\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "No se ha encontrado ninguna vía \"a\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"." + +#: ../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 "La vía \"desde\" no comienza o termina en un nodo \"vía\"." + +#: ../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 "La vía \"a\" no comienza o termina en un nodo \"vía\"." + +#: ../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 "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"." + +#: ../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 "La vía \"a\" no comienza o termina en la vía con rol \"vía\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "No se ha encontrado el estilo para la restricción {0}." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "La no-vía ''{0}'' en multipolígono" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Ninguna vía exterior en el multipolígono ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Intersección entre las vías ''{0}'' y ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "El estilo de la vía exterior ''{0}'' no coincide." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "sin etiquetar" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "texto" + +#. 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 "" +"Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión " +"primitiva con la versión inferior {2} no es visible. No se puede hacer " +"frente a esta incongruencia. Se mantiene mi primitiva. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inactivo" + #: ../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" @@ -2841,22 +3388,7 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Error: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Advertencia: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nodos" - -#: ../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" @@ -2865,12 +3397,7 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "vías" - -#: ../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" @@ -2879,253 +3406,4 @@ msgstr[1] "relaciones" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relaciones" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "conjunto de cambios" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "conjuntos de cambios" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "miembro {0}" -msgstr[1] "miembros {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "vía" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "ferrocarril" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vía fluvial" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "uso del suelo" - -#: ../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} nodo" -msgstr[1] "{0} nodos" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "No existe una primitiva con la versión {0} en este historial" - -#: ../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 "No hay ninguna versión válida en la fecha ''{0}'' en este historial" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "ninguna versión más antigua encontrada. El histórico está vacío." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "no se encontró ninguna versión más reciente. El histórico está vacío." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "No se encontró ninguna primitiva con ID {0} en este conjunto de datos" - -#: ../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 "" -"No se encontró ninguna primitiva con ID {0} y versión {1} en este conjunto " -"de datos" - -#: ../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 "parámetro \"{0}\" > 0 esperado, obtenido \"{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 "" -"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con 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 "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Vía de tipo área sin cerrar" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "La vía multipoligonal ''{0}'' no está cerrada." - -#. 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 "Miembro vacío en la relación." - -#: ../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 "Miembro ''{0}'' borrado en la relación." - -#: ../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 "Vía ''{0}'' con menos de dos puntos." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Se ha encontrado más de una vía \"desde\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Se ha encontrado más de una vía \"a\"." - -#: ../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 "Se ha encontrado más de un elemento \"vía\"." - -#: ../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 "Rol ''{0}'' desconocido." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Tipo de miembro \"{0}\" desconocido." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "No se ha encontrado ninguna vía \"desde\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "No se ha encontrado ninguna vía \"a\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"." - -#: ../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 "La vía \"desde\" no comienza o termina en un nodo \"vía\"." - -#: ../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 "La vía \"a\" no comienza o termina en un nodo \"vía\"." - -#: ../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 "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"." - -#: ../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 "La vía \"a\" no comienza o termina en la vía con rol \"vía\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "No se ha encontrado el estilo para la restricción {0}." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "La no-vía ''{0}'' en multipolígono" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Ninguna vía exterior en el multipolígono ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Intersección entre las vías ''{0}'' y ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "El estilo de la vía exterior ''{0}'' no coincide." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "sin etiquetar" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "texto" - -#. 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 "" -"Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión " -"primitiva con la versión inferior {2} no es visible. No se puede hacer " -"frente a esta incongruencia. Se mantiene mi primitiva. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inactivo" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3138,5 +3416,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "fondo" @@ -3146,13 +3424,13 @@ msgstr "resaltar" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" -msgstr "" +msgstr "WGS84 Geográfica" #: ../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 +msgstr "Gauss-Laborde Réunion 1947" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3168,21 +3446,21 @@ "y cree una nueva capa en otra zona." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Zona Lambert (Francia)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Zona Lambert (Estonia)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Rejilla suiza (Suiza)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3191,38 +3469,124 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "UTM20N Guadeloupe Ste-Anne 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "" +msgstr "UTM20N Martinique Fort Desaix 1952" #: ../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 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "No se ha podido leer los marcadores.
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "No se ha podido grabar el marcador.
{0}" #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "No mostrar de nuevo" -#: ../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/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 "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "vía" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "ferrocarril" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vía fluvial" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "uso del suelo" + +#: ../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} nodo" +msgstr[1] "{0} nodos" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "miembro {0}" +msgstr[1] "miembros {0}" + +#: ../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 "" "No se ha podido iniciar la comunicación con el servidor de OSM {0}.\n" "Compruebe la URL del servidor en sus preferencias y su conexión a 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 "desconocido" + +#: ../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 "" @@ -3235,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 "Violación de condición previa" -#: ../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 "desconocido" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3274,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 +msgstr "Excepción de seguridad" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3285,9 +3622,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +msgstr "Excepción de red" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3296,9 +3633,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 +msgstr "Excepción IO" + +#: ../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 "" @@ -3308,9 +3656,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Host desconocido" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3323,12 +3671,7 @@ "de error es:
{0} " -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitiva ya eliminada" - -#: ../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 @@ -3345,38 +3688,38 @@ msgstr "Descargando \"Mensaje del día\"" -#: ../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 "Subir preferencias" -#: ../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 "Subir las preferencias actuales al servidor" -#: ../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 "cadena de caracteres" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nombre del usuario." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Contraseña de 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 "Reescale a la geometría dada ( formato: ANCHO x ALTO )" -#: ../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 "cadena;cadena;..." -#: ../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 " @@ -3386,5 +3729,5 @@ "lat=y&lon=x&zoom=z o un archivo" -#: ../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 " @@ -3394,5 +3737,5 @@ "contenga lat=y&lon=x&zoom=z o un nombre de archivo" -#: ../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 " @@ -3402,75 +3745,94 @@ "estilo google o una URL que devuelva xml de osm" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "cualquier" -#: ../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 "Si se especifica, reinicie la configuración en lugar de leerla." -#: ../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 "Nombre de usuario" -#: ../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 "Contraseña" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opciones" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Mostrar esta ayuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Argumento de geometría standard de 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 "Bajar el rectángulo límite" -#: ../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 "Bajar la posición de la URL (con 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 "Abrir archivo (como gps en bruto si es .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 "Bajar el rectángulo límite como gps en bruto" -#: ../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 "Seleccionar dentro de la búsqueda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Lanzar en modo maximizado" -#: ../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 "Restablecer las preferencias a los valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Establezca el idioma." -#: ../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 "ejemplos" -#: ../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" @@ -3480,47 +3842,47 @@ "asegúrese que carga algún dato antes de --seleccionar" -#: ../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 "En vez de --bajar= puede especificar 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 "Activando los complementos actualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Cargando los primeros complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Ajustes predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Cargando los complementos" -#: ../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." msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Herramientas" -#: ../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 "Predefinidos" -#: ../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 @@ -3532,21 +3894,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 "Vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Interruptor de la vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Cambiar vista a pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3586,59 +3948,45 @@ msgstr "Reducir" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "escalar" -#: ../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 "La longitud geográfica en el puntero del ratón." -#: ../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 "El nombre del objeto en el puntero del ratón" -#: ../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 "La latitud geográfica en el puntero del ratón." -#: ../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 "El ángulo entre el segmento actual de vía y el anterior." -#: ../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 "La dirección (brújula) del segmento de línea que se está dibujando." -#: ../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 "La longitud del nuevo segmento de línea que se está dibujando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(sin objeto)" -#: ../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 "capa no listada" -#: ../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 "La capa ''{0}'' debe estar en la lista de capas" - -#: ../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 @@ -3649,10 +3997,4 @@ msgid "File not found" msgstr "Archivo no encontrado." - -#: ../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 @@ -3713,7 +4055,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" @@ -3729,5 +4070,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" @@ -3834,5 +4175,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 "Mi versión" @@ -3845,5 +4186,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" @@ -3859,5 +4200,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 "Su versión" @@ -3948,6 +4289,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" @@ -4066,10 +4407,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 "índice de columna inexperado. Obtenido {0}" -#: ../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 "" @@ -4080,19 +4421,19 @@ "{0}" -#: ../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 "Comunicación fallida con el servidor" -#: ../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 "Sí, deshacer el borrado de ellos también" -#: ../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 "No, calcelar la operación" -#: ../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 "" @@ -4104,5 +4445,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 "¿Deshacer el borrado de los nodos adicionales?" @@ -4123,10 +4464,10 @@ msgstr "¿Deshacer borrado de primitivos dependientes?" -#: ../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 "" "Propiedade de mi conjunto de datos, es decir el conjunto de datos locales" -#: ../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 " @@ -4136,5 +4477,5 @@ "elementos cuando se apliquen las decisiones de fusionar." -#: ../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 "" @@ -4142,91 +4483,93 @@ "servidor" -#: ../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 "Coordenadas:" -#: ../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 "Estado borrado:" -#: ../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 "Estado visible:" -#: ../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 "(ninguno)" -#: ../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 "borrado" -#: ../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 "no borrado" -#: ../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 "visible (en el servidor)" -#: ../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 "no visible (en el servidor)" -#: ../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 "Mantener un clon de la versión local" -#: ../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 "Eliminar físicamente del conjunto de datos locales" -#: ../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 "Mantener mis coordenadas" -#: ../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 "Mantener sus coordenadas" -#: ../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 "Conflicto no resuelto entre las diferentes coordenadas" -#: ../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 "Mantener mi estado suprimido" -#: ../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 "Mantener su estado suprimido" -#: ../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 "Mantener mi estado visible" -#: ../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 "Sí, reiniciar el 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 "No, abortar" -#: ../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 "" " Para mantener su versión local JOSM
tiene que restablecer el " @@ -4234,17 +4577,17 @@ "asignará
un nuevo identificador.
¿Está de acuerdo? " -#: ../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 "Reiniciar el id a 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 "Mantener su estado visible" -#: ../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 "Sí, purgarlo" -#: ../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 "" @@ -4253,21 +4596,21 @@ msgstr "" -#: ../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 "Eliminar desde el conjunto de datos" -#: ../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 "Conflicto entre estado visibles sin decidir" #: ../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 "Rol" #: ../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 "Primitiva" @@ -4307,10 +4650,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 @@ -4319,10 +4663,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 @@ -4336,5 +4681,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}" @@ -4378,4 +4723,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Su conjunto de datos no incluye una etiqueta con la clave {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 "ninguno" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "todos" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Seleccionar una color" + +#: ../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 "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{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 "el parámetro ''{0}'' no debe ser nulo" + +#: ../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 "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {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 "no borrado" + +#: ../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 "No implementado aún." + +#: ../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 "desde la vía" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Borrar de la relación" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Conflictos en dato" + +#: ../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} vía" +msgstr[1] "{0} vías" + +#: ../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} relación" +msgstr[1] "{0} relaciones" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Resolución de conflictos" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Resolver los conflictos" + +#: ../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 "Aplicar" + +#: ../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 "Pegar" + +#: ../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} iniciar" +msgstr[1] "{0} iniciar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4391,10 +4873,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 @@ -4402,5 +4884,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}" @@ -4433,5 +4915,5 @@ #: ../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." @@ -4439,31 +4921,25 @@ "Selecciona en el mapa los elementos seleccionados en la lista superior." -#: ../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 "Cancelar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../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 "Aplicar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Aplicar resolución" -#: ../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 +msgstr "Cerrar de todos modos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Continuar resolviendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4475,51 +4951,55 @@ 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 +msgstr "Conflicto no resuelto completamente" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Resolver los conflictos" -#: ../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 +msgstr "Resolver los conflictos de ''{0}'" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 msgid "History" msgstr "Historial" -#: ../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 "Mostrar el historial de todos los elementos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Fallo al cargar el historial desde el servidor. Detalles:
{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 "índice fuera de los límites. Obtenido {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 "Nodo {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 "Capa: {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 "Relaciones: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Historial del elemento" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Cargar historial" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Cargando historial para {0} con 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 "" @@ -4527,100 +5007,63 @@ #. 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 "Mostrar" -#: ../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 "Mostrando el historial de la primitiva seleccionada" -#: ../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 +msgstr "Diálogo no creado todavía. Invocar primero createInstance()" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 msgid "Layers" msgstr "Capas" -#: ../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 "Abrir un listado de todas las capas cargadas." -#: ../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 "Borrar la capa seleccionada" -#: ../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 "Eliminar capa" - -#: ../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 "" - -#: ../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 "Mostrar/Ocultar" -#: ../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 "Cambia estado de visibilidad de la capa seleccionada." -#: ../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 +msgstr "Activar" + +#: ../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 "Mover la capa seleccionada una fila arriba" -#: ../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 "Mover la capa seleccionada una fila abajo" -#: ../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." @@ -4629,28 +5072,22 @@ msgstr[1] "Esto cambiará {0} objetos." -#: ../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 "Un valor vacío elimina la clave." -#: ../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 "¿Modificar valores?" -#: ../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" @@ -4659,90 +5096,85 @@ msgstr[1] "Cambiar las propiedades de hasta {0} objetos" -#: ../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 "Por favor, selecciona una etiqueta" -#: ../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 "Por favor, selecciona un valor" -#: ../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 "" "Por favor, seleccione los objetos a los que desea cambiar las propiedades." -#: ../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 "Propiedades/Relaciones" -#: ../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 "Propiedades de los objetos seleccionados." #. 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 "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../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 "Añadir" -#: ../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 "Añadir una nueva pareja clave/valor para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Editar propiedades" -#: ../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 "Editar el valor de la clave seleccionada para todos los objetos" -#: ../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 "Propiedades: {0} / Miembros: {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 "Propiedades / Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Cambiar relación" -#: ../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 "¿Seguro de eliminar la selección de la relación {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 "Borrar la clave seleccionada en todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Eliminar propiedades" @@ -4751,34 +5183,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 "Relaciones" -#: ../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 "Abrir una lista de todas las relaciones." -#: ../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 "Relaciones: {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 "Abrir un editor para la relación seleccionada" -#: ../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 "Borrar la relación seleccionada" -#: ../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 "Crear un anueva relación" -#: ../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 "" @@ -4811,23 +5243,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 "Selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} vía" -msgstr[1] "{0} vías" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relación" -msgstr[1] "{0} relaciones" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4835,14 +5253,9 @@ msgstr "Selección: {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 "Desacoplar el panel" -#: ../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." @@ -4851,64 +5264,99 @@ "herramientas de la izquierda." -#: ../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 "Haga click para minimizar/maximizar el contenido del panel" -#: ../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 "Autores" -#: ../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 "Abrir una lista de la gente trabajando en los objetos seleccionados" -#: ../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] "Autor" +msgstr[1] "Autor" + +#: ../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 "Mostrar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Más información sobre esta característica" + +#: ../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 "" +"ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez {0} " +"de {1} solo seleccionados primitivos" + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "Nº de objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autores: {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 +msgstr "Descargar las relaciones selecionadas" + +#: ../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 "Descargar relación de miembros" -#: ../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 "Conflictos en dato" -#: ../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 "" @@ -4917,47 +5365,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 " @@ -4966,14 +5408,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 +msgstr "Eliminarlos, limpiar la relación" + +#: ../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 +msgstr "Ignorarlos, dejar la relación como está" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 #, java-format msgid "" @@ -4983,9 +5425,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 "" @@ -4995,15 +5437,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -5011,5 +5453,5 @@ msgstr "" -#: ../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 " @@ -5017,20 +5459,20 @@ msgstr "" -#: ../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 "" @@ -5039,57 +5481,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 "Mover los miembro(s) seleccionos hacia arriba" #. 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 "Mover los miembros seleccionados hacia abajo" #. 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 " @@ -5098,9 +5540,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 "" @@ -5109,20 +5551,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 "Aplicar" - -#: ../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 @@ -5132,37 +5570,37 @@ msgstr "Aceptar" -#: ../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 "Cancelar las actualizaciones y cerrar el cuadro de diálogo" -#: ../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 "Descargar todas las vías y nodos incompletos de esta relación" -#: ../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 "Descargar miembros" -#: ../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 "Aplicar rol" -#: ../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 "" @@ -5172,30 +5610,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 "" @@ -5209,22 +5647,27 @@ msgstr "Vinculado" -#: ../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 "Editar relaciones" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5257,34 +5700,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] "Eliminar las claves antiguas de hasta {0} objecto" -msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Marcadores" -#: ../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 "Por favor, introduzca las coordenadas deseadas primero." -#: ../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 "Por favor, introduzca un nombre para la localización." -#: ../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 "Seleccione un marcador primero." @@ -5343,13 +5773,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 "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida" -#: ../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 "Please, introduzca la cadena de caracteres que desea buscar" -#: ../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 "No se pueden leer los resultados de lugares desde el servidor" @@ -5357,18 +5787,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 "Introduzca un lugar para buscar:" -#. 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 "Lugares" #. 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 "nombre" @@ -5407,37 +5836,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 "tipo" -#: ../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 "próximo a" -#: ../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 "zoom" -#: ../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: " @@ -5446,5 +5875,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 "Mapa desplazable" @@ -5471,47 +5900,75 @@ msgstr "Números de teselas" -#: ../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 "Historial para {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 "Historial para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historial para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Cerrar el diálogo" -#: ../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 "Mostrando el historial de la primitiva seleccionada" + +#: ../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 "Nodo {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Cargar historial" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Cargando historial para {0} con id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Cargando historial para {0} con id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Cargando historial para {0} con id {1}" #. item "Streets/Motorway" text "Reference" @@ -5829,14 +6286,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6012,8 +6483,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" #. @@ -6110,4 +6587,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6221,6 +6701,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 @@ -6228,153 +6708,171 @@ #: 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 "Nombre" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Conjunto de cambios {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Más información sobre esta característica" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Conjunto de cambios {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6383,33 +6881,289 @@ msgstr "Versión {0} creada en {1} por {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Versión" -#: ../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 "Nombre de la calle" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Sí" + +#: ../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 "Por favor, selecciona un valor" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "La capa ''{0}'' debe estar en la lista de capas" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Arreglar conflictos de etiquetas" + +#: ../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] "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +#, fuzzy +msgid "Unsafed data non-writable files" +msgstr "Ignorar el uso de etiquetas de archivos por defecto." + +#: ../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 "Descartar y salir" + +#: ../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 "Guardar y salir" + +#: ../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 "Capa" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Al envío" + +#: ../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 "Archivo" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Subiendo" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "No hay primitivas seleccionadas para actualizar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Imágenes para {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 "Leer 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 "No hay hora para el punto {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 "No pudo leerse la hora \"{0}\" desde el punto {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 "" "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora." -#: ../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 +7171,29 @@ msgstr "Leyendo {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 "Imagenes Geoetiquetadas" -#: ../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 "Iniciar 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 "Finalizar 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 "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "diferencia de zona horaria: " -#: ../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" @@ -6448,14 +7202,14 @@ msgstr[1] "imagenes" -#: ../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} dentro de la traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sincronizar reloj" -#: ../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 @@ -6463,82 +7217,82 @@ msgstr "Imágenes 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 "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." -#: ../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 "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Imagen" -#: ../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 "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" -#: ../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 "Zona horaria del GPS (diferencia con la foto)" -#: ../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 "Sincronizar hora con la del receptor 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 "La hora no pudo ser analizada sintácticamente." -#: ../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 "punto 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 "Personalice el dibujo de línea" +#: ../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 "Usar las preferencias globales" + #: ../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 "Usar las preferencias globales" +msgid "Draw lines between points for this layer." +msgstr "Dibujar las líneas entre puntos en esta capa" #: ../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 "Dibujar las líneas entre puntos en esta capa" - -#: ../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 "No dibujar las líneas entre puntos en esta capa" -#: ../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 "Seleccione las opciones de dibujo de línea" -#: ../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 "Personalizar colores" -#: ../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 "Predeterminado" -#: ../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" @@ -6598,5 +7352,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}" @@ -6612,10 +7366,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 "Convertir en capa de datos" #: ../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." @@ -6626,11 +7380,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 (EN)" #: ../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 @@ -6672,4 +7426,9 @@ "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Descargando datos" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6693,64 +7452,64 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../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 "Capa de datos {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 "fuera del área descargada" -#: ../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 "versión {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 "" -#: ../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} formado por:" -#: ../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} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "sin ajustar" -#: ../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 "Versión del 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 "Convertir a capa de 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" @@ -6758,5 +7517,5 @@ msgstr[1] "pistas" -#: ../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" @@ -6764,5 +7523,5 @@ msgstr[1] "puntos" -#: ../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" @@ -6771,5 +7530,5 @@ msgstr[1] "una traza con {0} puntos" -#: ../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" @@ -6778,5 +7537,5 @@ msgstr[1] "{0} formado por las trazas {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" @@ -6785,9 +7544,9 @@ msgstr[1] "{0} puntos" -#: ../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 "Marcador 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" @@ -6795,5 +7554,5 @@ msgstr[1] "marcadores" -#: ../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" @@ -6813,5 +7572,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}." @@ -6819,5 +7578,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 "No se puede sincronizar en la capa que se escuchaba." @@ -6848,5 +7607,5 @@ "Interruptor de la visiblidad del estado de los marcadores de texto e iconos." -#: ../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 " @@ -6856,5 +7615,5 @@ "pista de sonido estaba reproduciendo (rebasado el primer marcador)." -#: ../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 " @@ -6864,30 +7623,30 @@ "marcador de audio o a un punto de traza, en donde quiera sincronizar." -#: ../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 "No se ha podido crear un marcador de audio nuevo" -#: ../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 "Ha habido un error cuando se intentaba mostrar la URL de este marcador" -#: ../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 "(La URL era: " -#: ../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 "Error mostrando la 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 "Preferencias avanzadas" -#: ../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 "" "Establecer valores de preferencias manualmente. ¡Utilícelo con precaución!" -#: ../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 @@ -6895,14 +7654,14 @@ msgstr "Buscar: " -#: ../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 "El valor actual es el de por defecto" -#: ../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 "El valor por defecto es ''{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 "" @@ -6910,13 +7669,13 @@ "usado todavía)" -#: ../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 "Por favor, seleccione la fila a editar" -#: ../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 @@ -6924,14 +7683,14 @@ msgstr "Nuevo valor de {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 "Por favor, seleccione la fila a borrar" -#: ../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 "Introduzca un par parámetro/valor" @@ -7074,40 +7833,40 @@ msgstr "Calibración grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Color" -#: ../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 "Estilo de representación {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 "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Seleccionar" -#: ../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 "Seleccionar un color para {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 "Establecer como predeterminado" -#: ../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 "Establecer todo como predeterminado" -#: ../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 "Colores usados por diferentes objetos en JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Colores" @@ -7153,5 +7912,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Coche" @@ -7173,16 +7932,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 "Bicicleta" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7212,12 +7972,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 "Pie" @@ -7407,5 +8167,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 "Mostrar pantalla de bienvenida al inicio" @@ -7413,23 +8173,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 "Mostrar el ID del objeto en las listas de selección" #: ../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 "Mostrar el ID del objeto en las listas de selección" + +#: ../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 "Dibujar línea de ayuda" -#: ../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 "Trabajando sin modo (estilo 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 "Mostrar el ID del objeto en las listas de selección" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "No requiere cambiar de modos (flujo de trabajo estilo 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 "Visualización y comportamiento" @@ -7461,54 +8232,54 @@ msgstr "Estilo usado" -#: ../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 "Configurar los complementos disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Descargar lista" -#: ../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 "Actualizar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Configurar sitios ..." -#: ../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 "Añadir URL de la descripción del componente de 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 "Por favor seleccione una entrada." -#: ../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 "Editar la URL de la descripción del componente de 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 "Configurar los sitios de complementos" #. 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 "Opciones de visualización" -#: ../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 +8287,41 @@ msgstr "Varios ajustes que manejan la presentación visual del programa." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Ajustes de la conexión" -#: ../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 "Configuración del servidor 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 "Ajustes del mapa" -#: ../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 "Ajustes para la proyección del mapa y la interpretación de datos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Configuración de audio" -#: ../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 "Configuración del audio player y de los marcadores" -#: ../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 "Debes reiniciar JOSM para que las preferencias tengan efecto" -#: ../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 "Visualizar las coordenadas como" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Método de proyección" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Proyección del mapa" @@ -7583,12 +8354,4 @@ msgid "Proxy server password" msgstr "Contraseña del servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "La URL base del servidor OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL base del servidor" #. 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 +8378,60 @@ msgstr "Atajo de teclado" -#: ../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 "Ordenar descripción: {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 "Autor: {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 "Página web: {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 "Versión: {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 "Rutas del icono" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Copiar predeterminados" -#: ../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 "Por favor, seleccione una fila para copiar" -#: ../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 "" -#: ../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 "Borrar la fuente seleccionada de la lista." -#: ../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 "" @@ -7861,36 +8623,59 @@ msgstr "Grupos de modificadores" -#: ../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] "Eliminar las claves antiguas de hasta {0} objecto" +msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Añadir una nueva capa" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Borrar la capa seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Más información sobre esta característica" #. 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 "Atributos opcionales" -#: ../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 "Usar preferencia ''{0}'' del grupo ''{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 "Usar preferencia ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "vía sin salida" -#: ../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 "Tipo desconocido: {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 @@ -7898,15 +8683,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {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 "Error analizando {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 "Los elementos del tipo {0} son soportados" -#: ../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 @@ -7916,22 +8701,22 @@ msgstr[1] "Modificar objetos {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 "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Cambiar propiedades" -#: ../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}''" @@ -7970,11 +8755,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 "No se pudo leer \"{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 " @@ -7984,38 +8769,38 @@ "licencia 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 "Archivos GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "Descripción de la traza GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Añadir información del autor" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nombre real" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "Correo electrónico" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Derechos de autor (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Predefinido" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Año del copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Palabras claves" @@ -8025,9 +8810,9 @@ msgstr "Opciones de exportación" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportar y guardar" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8038,10 +8823,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 "Elegir una licencia predefinida" -#: ../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 @@ -8051,12 +8836,12 @@ msgstr "Marcadores desde {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 "El archivo \"{0} no existe" -#: ../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" @@ -8079,6 +8864,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 @@ -8088,20 +8873,40 @@ msgstr "Descargando datos 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 "Editar la relación nº {0} en la capa \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "No se ha añadido nada a la selección al buscar \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8109,34 +8914,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Archivos 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 "Coordenadas importadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Sentencias mal formadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Errores de suma de verificación: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Sentencias desconocidas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Coordenadas cero: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Éxito en la importación NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "¡Fallo en la importación NMEA!" @@ -8147,9 +8952,9 @@ msgstr "" -#: ../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 "Esta versión de JOSM es incompatible con el servidor configurado" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8160,15 +8965,15 @@ "{0} a {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 "Establecidas comunicaciones con {0} usando la versión de protocolo {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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8176,33 +8981,91 @@ msgstr "" -#: ../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 "Abriendo conjunto de cambios..." -#: ../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 "Abriendo conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Abriendo conjunto de cambios..." + +#: ../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 "Abriendo conjunto de cambios..." + +#: ../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 "Cerrando conjunto de cambios..." -#: ../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 "Cerrando conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Abriendo conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Subiendo..." -#: ../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 +msgstr "OK - intentando de nuevo." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 #, java-format msgid "Starting retry {0} of {1}." @@ -8223,5 +9086,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" -msgstr "" +msgstr "Archivo comprimidos en bzip2 del Servidor OSM" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 @@ -8230,29 +9093,33 @@ msgstr "Archivo bz2 inválido" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Contraseña o nombre de usuario incorrectos" -#: ../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 "Advertencia: La contraseña se transferirá sin cifrar." -#: ../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 "Grabar nombre de usuario y contraseña (sin cifrar)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Introduzca contraseña" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Inicio de sesión" -#: ../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 "La URL base del servidor OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Nombre de usuario (correo-e) a la cuenta 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." @@ -8261,13 +9128,17 @@ "clave." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL base del servidor" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "Nombre de usuario OSM (correo-e)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "Contraseña 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." @@ -8276,20 +9147,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Archivos del servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8298,5 +9169,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8508,35 +9379,46 @@ "conexión a Internet." -#: ../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}), faltan {3}. Actualizando {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}), faltan {3}. Actualizando {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}), faltan {3}. Actualizando {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 "Nada que subir. Consigue algunos datos primero." + +#: ../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 "Actualizar complementos" -#: ../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 "Descarga de complementos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8549,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." @@ -8557,23 +9439,23 @@ "Complementos {0} descargados correctamente. Por favor, reinicie 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 "Descargando complemento {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Saltar descarga" -#: ../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 "Versión de JOSM {0} requerida para el complemento {1}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Descargar complemento" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Salta la descargar" @@ -8584,15 +9466,15 @@ msgstr "Ha ocurrido un error en el complemento {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 "El complemento {0} requiere una actualizar JOSM a la versión {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." @@ -8601,15 +9483,15 @@ "encontrado" -#: ../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 "Complemento no encontrado: {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 "La última actualización de los complementos fue hace más de {0} días" -#: ../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 " @@ -8619,22 +9501,22 @@ "aviso
cambiando la opción de configuración '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 "Deshabilitar complemento" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" +msgstr "" +"No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" + #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" -"No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Mantener componente" -#: ../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 " @@ -8644,5 +9526,5 @@ "permiso para escribir sobre los existentes" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8652,10 +9534,10 @@ "\"." -#: ../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 "De acuerdo a la información del componente, el autor es {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." @@ -8664,9 +9546,9 @@ "informar del error." -#: ../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 "¿Se debe deshabilitar el complemento?" -#: ../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 " @@ -8676,13 +9558,13 @@ "JOSM para descargarle del programa." -#: ../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 +msgstr "Información del complemento" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -8693,5 +9575,5 @@ msgstr "Más detalles" -#: ../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" @@ -8700,18 +9582,18 @@ msgstr[1] "Información del complemento descargada de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "No se ha encontrado información del complemento." -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +msgstr "El complemento llamado {0} no está disponible. Omitir actualización." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93 msgid "All installed plugins are up to date." msgstr "Todos los complementos instalados están actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8724,9 +9606,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 "Descargar los complementos que faltan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8739,35 +9621,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}: Versión {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 "Complemento incluido en 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 "Error al leer el archivo de información del complemento: {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 "Esto está despues del final de la grabación" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Error reproduciendo sonido" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "No hacer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Informar del error" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8782,18 +9664,18 @@ "de JOSM, por favor, considere enviar un informe de error." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Excepción inesperada" -#: ../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 "Por favor presente una \"ticket\" en {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 "Incluya los pasos previos al error (lo más detalladamente posible)" -#: ../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 " @@ -8803,13 +9685,13 @@ "complementos antes de comunicar un fallo." -#: ../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 "Asegúrese de incluir la siguiente información:" -#: ../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 "(El texto ya ha sido copiado a tu portapapeles.)" -#: ../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}." @@ -8817,6 +9699,6 @@ "No se puede encontrar la traducción para el idioma {0}. Revertiendo a {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 "" @@ -8825,5 +9707,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8832,5 +9714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8844,5 +9726,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" @@ -8852,5 +9734,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8861,21 +9743,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 "(Pista: Usted puede editar los atajos en las preferencias.)" -#: ../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 "" @@ -8904,9 +9821,27 @@ msgstr "Crear rejilla de vías" -#: ../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 "Subir traza" -#: ../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 @@ -8914,27 +9849,40 @@ msgstr "Subir trazas" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Público" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Se ha seleccionado hacer públicas sus trazas GPS en 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 (EN)" + +#: ../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 "Descripción" -#: ../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 "Por favor, introduzca la descripción sobre su traza" -#: ../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 "Por favor, introduzca una etiqueta sobre su traza" -#: ../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}" @@ -8942,48 +9890,48 @@ #. 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 "Conectando..." -#: ../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 "Subida cancelada" -#: ../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 "Error al actualizar" -#: ../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 subido correctamente" -#: ../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 "Subida fallida. El servidor retorna el siguiente mensaje " -#: ../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 "Subiendo traza GPX: {0}% ({1} de {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 "" "Ninguna descripción facilitada. Por favor, proporcione alguna descripción." -#: ../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 "No hay ninguna capa gpx seleccionada. No se puede subir la traza." -#: ../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 "Ningún nombre de usuario facilitado." -#: ../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 "Ninguna contraseña facilitada." -#: ../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 "Subiendo traza GPX" @@ -9096,19 +10044,19 @@ msgstr "Cargar el conjunto de imágenes como una nueva capa." -#: ../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 "Archivos 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 "El archivo {0} ya está cargado con el nombre \"{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 "Error mientras se analizaba sintácticamente {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." @@ -9120,34 +10068,34 @@ "lee en la foto y seleccione una zona horaria
" -#: ../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 "Hora de la foto (desde 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 "Hora del Gps (leída desde la foto tomada): " -#: ../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 " [dd/mm/aaaa hh:mm:ss]" -#: ../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 "Yo estoy en la zona horaria de: " -#: ../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 "Sin fecha" -#: ../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 "Abrir otra foto" -#: ../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 "sincronizar el tiempo de una foto con el receptor 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" @@ -9157,29 +10105,29 @@ "Por favor, utilice el formato requerido." -#: ../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 "Fecha no válida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 "Traza 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 "Abrir otra traza 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 "Zona horaria: " -#: ../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 "Ajuste:" -#: ../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 "" @@ -9187,41 +10135,41 @@ "html>" -#: ../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 "Actualizar posición para: " -#: ../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 "Todas las imágenes" -#: ../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 "Imágenes sin la posición 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 "Fotos no etiquetadas todavía" -#: ../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 "Correlacionar las imágenes con la traza 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 "Correlación" -#: ../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 "Estimación automática" -#: ../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 "Debe seleccionar una traza 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 "No se ha seleccionado una traza 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 "" @@ -9232,9 +10180,9 @@ "Formato esperado: {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 "Zona horaria no válida" -#: ../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 "" @@ -9245,18 +10193,18 @@ "Formato esperado: {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 "Desplazamiento inválido" -#: ../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 "Encontrado {0} coincidencias de{1} en la traza 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 "Traza GPX cargada" -#: ../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 "" @@ -9264,9 +10212,9 @@ "fueron tomadas." -#: ../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 "Las fotografías no contiene información horaria" -#: ../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." @@ -9275,39 +10223,39 @@ "seleccione otra." -#: ../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 "La traza GPX no posee información horaria" -#: ../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 "Zona horaria: {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 "Minutos: {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 "Segundos: {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 "Ajustadas al track GPS {0} de {1} fotografías" -#: ../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 "(Diferencia horaria de {0} días)" -#: ../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 "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" -#: ../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 " @@ -9315,13 +10263,13 @@ msgstr "" -#: ../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 "Ajuste de fotografías a traza fallido" -#: ../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 "Ajustar zona horaria y la diferencia temporal" -#: ../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 "Valores por defecto" @@ -9342,5 +10290,5 @@ msgstr "Error en archivo {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9353,12 +10301,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 "Seleccionar todo" - -#: ../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 "Error al leer el archivo" @@ -9387,8 +10334,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 "" "Pueblo/ciudad {0} no hallado o disponible en WMS.\n" @@ -9399,21 +10346,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 "Seleccionar comuna" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Elegir desde..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Digitalización automática" -#: ../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" @@ -9422,13 +10369,19 @@ 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 "JOSM está detenido para que el cambio surta efecto." -#: ../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 "" @@ -9436,25 +10389,30 @@ "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 "Invertir escala de grises (para fondos de pantalla negros)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Fijar fondo de pantalla transparante" -#: ../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 "Dibujar límites de los datos descargados." -#: ../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 "Activar caché automático" -#: ../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 "Tamaño máximo de caché (en MB)" -#: ../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." @@ -9472,9 +10430,9 @@ "creado mediante este componente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS del catastro francés" -#: ../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 "" @@ -9482,10 +10440,10 @@ "activo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Fuente" -#: ../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 " @@ -9495,5 +10453,5 @@ "preferencias de 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). " @@ -9503,9 +10461,9 @@ "intermedios. Útil para los textos sobre fondos oscuros." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Permitir múltiples capas apiladas" -#: ../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 "" @@ -9513,5 +10471,5 @@ "transparente." -#: ../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 "" @@ -9519,29 +10477,27 @@ #. 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 "División de la zona de descarga:" - -#: ../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 "" "Graba las imágenes más pequeñas (mejor calidad pero mayor uso de memoria)" -#: ../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 "Fijar tamaño del cuadrado (por defecto 100 m)" -#: ../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 "Tamaño fijado (desde 25 a 100 m)" -#: ../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 "División de la zona de descarga:" - -#: ../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 "" @@ -9602,12 +10558,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contactando con servidor WMS..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "la imagen no se carga" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9641,20 +10595,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" @@ -9662,9 +10616,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 "cargando imagen..." + +#: ../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" @@ -9672,31 +10632,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 "Este" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 +msgid "North" +msgstr "Norte" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Enter cadastre east,north position" -msgstr "Introduzca Lat/Lon para ir a la posición." - -#: ../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 "este" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "norte" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Mantener sus coordenadas" +msgid "Set " +msgstr "Seleccionar" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9760,8 +10728,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25 msgid "Export as PNG format (only raster images)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +msgstr "Exportar como formato PNG (solo imágenes raster)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9785,6 +10753,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 "Capa en blanco" @@ -9800,7 +10768,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Centro de la imágen ráster: {0}" +msgstr "Tamaño de la imagen raster: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10328,6 +11296,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 "lámina de agua" @@ -10340,8 +11308,4 @@ msgid "land" msgstr "tierra" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "ninguno" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10513,5 +11477,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsData.java:130 msgid "no name" -msgstr "" +msgstr "sin nombre" #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45 @@ -10638,9 +11602,9 @@ msgstr "Bucle de descarga de 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 "Mostar cuestiones de OpenStreetBug" -#: ../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 " @@ -10652,5 +11616,5 @@ "cambiar al nuevo servidor? (Recomendado)" -#: ../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 "¿Cambiar al nuevo servidor OpenStreetBugs?" @@ -11084,10 +12048,10 @@ #, java-format msgid "{0} start" -msgstr "" +msgstr "{0} iniciar" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63 #, java-format msgid "{0} end" -msgstr "" +msgstr "{0} finalizar" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 @@ -11229,5 +12193,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 "Nombre de la calle" @@ -11246,29 +12210,29 @@ msgstr "Mostrar Panel de Autor" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Abrir página de usuario" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Abrir página de usuario en el navegador" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Seleccionar los datos del usuario" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Remplazar selección con los datos de usuarios" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Por favor, seleccione algunos datos" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Por favor seleccione algún usuario en el panel de autor" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Lo siento, no funciona con usuario anónimos" @@ -11282,25 +12246,15 @@ msgstr "Unir áreas que se superponen con otras" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo al " -"servidor." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Continuar de todos modos" - -#: ../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 "Sólo un máximo de dos áreas pueden unirse por el momento." -#: ../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}\" no está cerrado y, por tanto, no se puede unir." -#: ../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" @@ -11312,38 +12266,38 @@ "¿Está seguro de continuar?" -#: ../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 "Por favor, abortar si usted no está seguro" -#: ../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 "Por favor, seleccione al menos un vial cerrado para ser unido." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "No se encontró ninguna intersección. Nada ha cambiado." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Nodo añadido en todas las intersecciones" -#: ../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 "Eliminar vías que no formen parte de un multipolígono interior" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Arreglar relaciones" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Fusionar área superpuesta consigo misma" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Fusionar áreas superpuestas" -#: ../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 " @@ -11353,33 +12307,33 @@ "favor, compruebe los errores no se han introducido." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Arreglar conflictos de etiquetas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Eliminar elementos de las relaciones" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Fusionar áreas: eliminar las vías cortas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Vía cerrada" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Eliminar etiquetas de vías internas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Función para la fusión de áreas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Salta a la posición" -#: ../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 "" @@ -11387,50 +12341,50 @@ "especifica" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Introduzca Lat/Lon para ir a la posición." -#: ../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 "También puedes pegar una dirección URL de www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (en metros)" -#: ../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 "Ir allí" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Salta a la posición" -#: ../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 "" "Imposible analizar la Longitud, Latitud y Zoom. Por favor, verifíquelo." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Imposible analizar sintácticamente Lon/Lat" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Simplificar vía" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Eliminar nodos innecesarios de una vía." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Por favor, seleccione al menos una para simplificar." -#: ../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?" @@ -11442,25 +12396,25 @@ "La selección contiene {0} vías. ¿Está seguro que quiere simplificarlas todas?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "¿Está usted seguro?" -#: ../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 "Validación de errores" -#: ../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 "Sin validación de errores" -#: ../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 "Rejilla" -#: ../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 "" @@ -11553,53 +12507,53 @@ msgstr "Realiza la validadción de datos" -#: ../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 "Datos con errores. ¿Aún así desea subirlos al servidor?" -#: ../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 "Abrir la ventana de validación" -#: ../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 "Zoom al problema" -#: ../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 "Corregir" -#: ../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 "Corregir los errores seleccionados" -#: ../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 "Ignorar" -#: ../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 "Ignorar los errores selecionados la próxima vez." -#: ../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 "Todo el grupo" -#: ../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 "Solo los elementos" -#: ../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 "Ninguno" -#: ../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 "¿Ignorar todo el grupo o los elementos individuales?" -#: ../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 "Ignorando elementos" -#: ../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" @@ -11623,23 +12577,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 "" "Este test comprueba si dos carreteras, vías de tren o vías fluiviales se " "cruzan al mismo nivel, sin estar conectadas por algún nodo." -#: ../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 "Crear edificios" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Cruce de vías" -#: ../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 "Nodos duplicados" -#: ../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 "Esta examen comprueba que no haya nodos en el mismo lugar." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Nodos con el mismo nombre" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Confirmación" + +#: ../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 "Duplicar vía" + +#: ../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 "Esta examen comprueba que no haya nodos en el mismo lugar." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Crear un duplicado de la vía" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11729,9 +12716,9 @@ "escrito mal." -#: ../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 "Comprobación de propiedades:" -#: ../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 "" @@ -11739,15 +12726,15 @@ "valores." -#: ../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 "Línea de test de etiquetas no válida - {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 "Línea de correción ortográfica no válida: {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 "" @@ -11758,7 +12745,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 "Combinaciones incorrectas de etiquetas y/o valores" @@ -11766,61 +12753,61 @@ #. 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 "Problema al dibujar" -#: ../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 "Clave ''{0}'' no válida." -#: ../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 "Etiquetas con valores vacíos" -#: ../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 "Clave de propiedad no válida" -#: ../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 "Espacio en blanco no válido en la clave de propiedad" -#: ../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 "" "Los valores de la propiedad empiezan y terminan con un espacio en blanco" -#: ../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 "Los valores de propiedad contienen entidad de 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 "La clave ''{0}\" no existe en los predefinidos" -#: ../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 "Esta clave no está predefinida" -#: ../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 "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos." -#: ../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 "Los predefinidos no contiene valores apropiados" -#: ../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 "Comprobar las propiedades de las claves" -#: ../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 "" @@ -11828,21 +12815,21 @@ "comprobación de las palabras." -#: ../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 "Usar analizador de propiedad compleja." -#: ../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 "Validar valores de propiedad y etiquetas que usan reglas complejas" +#: ../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 "Fuente de test de etiquetas" -#: ../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." @@ -11853,21 +12840,21 @@ "del corrector de etiquetas." -#: ../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 "Agregar nueva fuente a la lista." -#: ../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 "Editar la fuente seleccionada." -#: ../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 "Fuentes de datos" -#: ../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 "Analizar propiedades de los valores." -#: ../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 "" @@ -11875,62 +12862,62 @@ "los predefinidos." -#: ../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 "Comprobar 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 "Buscar nodos o viales con FIXME en cualquier propiedad de valor" -#: ../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 "Compruebar el registro de notas." -#: ../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 "Analizar si el mapa creado contiene errores en los datos." -#: ../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 "Usar datos de archivo por defecto." -#: ../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 "Usar datos de archivo por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 msgid "Use default tag ignore file." msgstr "Ignorar el uso de etiquetas de archivos por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use the default tag ignore file (recommended)." msgstr "Utilizar etiquetas de archivos por defecto (recomendado)." -#: ../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 "Utilizar el corrector ortográfico por defecto." -#: ../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 "Utilizar el corrector ortográfico por defecto (recomendado)." -#: ../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 "Fijar las propiedades" -#: ../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 "No se pudo encontrar el tipo de elemento" -#: ../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 "No se pudo encontrar el nivel de alerta" -#: ../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 "Expresión ilegal ''{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}''" @@ -12075,7 +13062,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 "edificio" @@ -12089,5 +13076,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 "área" @@ -12192,5 +13179,5 @@ #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 msgid "Scanned Map..." -msgstr "" +msgstr "Mapa escaneado..." #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 @@ -12212,5 +13199,5 @@ #, java-format msgid "Walking Papers: {0}" -msgstr "" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -12230,5 +13217,5 @@ msgstr "Alcanzar una intersección" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Ocurrió una excepción" @@ -12273,14 +13260,14 @@ msgstr "Ayuda del componente 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 "Rectificar la imagen..." -#: ../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 "Descargar imagen rectificada desde varios servicios" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12291,26 +13278,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 "Personalizar enlace WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Servicios de rectificación soportados:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Visitar la web del programa" -#: ../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 "URL del WMS o ID de la imágen" -#: ../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 "Añadir imágen rectificada" -#: ../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 " @@ -12318,37 +13305,55 @@ msgstr "" -#: ../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 "URL o id de WMS no válida" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Ajustar 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 "Ajustar la posición de la capa WMS seleccionada" -#: ../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 +msgstr "Por favor, selecciona la capa WMS a ajustar." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +msgstr "Seleccionar capa WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" -msgstr "" +msgstr "Inicio de ajuste" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgid "There are currently no WMS layer to adjust." +msgstr "No existe alctualmente ningua capa WMS que ajustar." #: ../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 +msgstr "Ninguna capa que ajustar" + +#: ../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 "" @@ -12364,15 +13369,43 @@ msgstr "Descarga automática" -#: ../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 "Activar" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {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 "Capa WMS ({0}), descargando en zoom {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 "Fecha no válida" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12381,58 +13414,58 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Cargar capa 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}" msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../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 "Abrir una capa WMS en blanco para cargar datos desde un archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Preferencias del componente 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 "" @@ -12443,33 +13476,45 @@ "para añadirlo a la lista superior de servidores mostrados)" -#: ../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 "Nombre del menú" -#: ../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 "Dirección URL del servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Nombre del menú (por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "Dirección URL del servicio WMS (Por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Introduce un nombre y una dirección para el servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Copiar por defecto" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Copiar predeterminados" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Por favor seleccione por lo menos una vía." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Gestor de descarga:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "Archivos TCX (*.tcx)" #. * @@ -12594,5 +13639,5 @@ #: build/trans_plugins.java:23 msgid "Visualizes routing information as a routing graph." -msgstr "" +msgstr "Visualiza la información de enrutamiento como un gráfico de enrutado." #. Plugin grid @@ -12702,4 +13747,7 @@ "defined in routes.xml file in plugin directory" msgstr "" +"Renderizar rutas (autobús, rutas de senderismo, rutas ciclables, ..). Los " +"tipos de ruta deben ser definidos en el archivo routes.xml del directorio de " +"componentes" #. Plugin routing @@ -12781,4 +13829,6 @@ "plugin is still under early development and may be buggy." msgstr "" +"Soporta la descarga de teselas, mapas digitalizados de walking-papers.org. " +"Este componente aún está en un desarrollo temprano y puede ser inestable." #. Plugin waydownloader @@ -12888,62 +13938,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 "Referencia" - -#. 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 "Capa" #. item "Streets/Motorway" combo "Layer" @@ -12958,5 +13953,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 "Carriles" @@ -12971,5 +13966,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" @@ -12979,10 +13973,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 "Velocidad max. (km/h)" @@ -13026,9 +14020,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 "Sentido único" @@ -13076,13 +14070,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 "Puente" @@ -13124,13 +14118,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 "Túnel" @@ -13170,12 +14164,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 "Desmonte" @@ -13215,12 +14209,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 "Terraplén" @@ -13376,17 +14370,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 "Anchura (metros)" @@ -13413,4 +14407,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" @@ -13429,11 +14424,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 "Superficie" @@ -13443,4 +14439,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" @@ -13455,9 +14452,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 "pavimentada" @@ -13465,10 +14463,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 "sin pavimentar" + +#: 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 "Chalet" + +#: 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 "hormigón" + +#: 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 "Alquiler" + +#. 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 "bosque" + +#: 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 "billetes de aparcamiento" #. item "Ways/Track Grade 2" combo "Surface" @@ -13476,12 +14537,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 "adoquinado" + +#: 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 "grava" + +#: 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 "adoquinado" + +#: 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 "incompleto" + +#: 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 "hierba" + +#: 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 "hierba" + +#: 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 "arena" + +#. 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 "suelo" #. item "Streets/Residential" text "Width (meters)" @@ -13562,20 +14705,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Restricciones de tráfico" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Editar restricciones de tráfico" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Peaje" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Sin salida (cul-de-sac)" @@ -13588,8 +14731,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 "Acceso" @@ -13624,32 +14767,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 "sí" @@ -13662,40 +14820,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 "privado" -#: 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 "designado" @@ -13708,19 +14866,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 "destino" @@ -13743,65 +14901,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 "permisivo" -#: 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 "agrícola" -#: 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 "no" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Mercancías" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Vehículo de mercacías pesado (hgv)" @@ -13816,10 +14979,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 "Caballo" @@ -13835,17 +14998,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 "Moto" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13857,30 +15019,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 "Coche" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Vehiculos de servicio público (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Barco a motor" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Barco" #. 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 "Velocidad mínima (km/h)" @@ -13888,25 +15050,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 "Peso máximo (t)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Altura max. (en metros)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Anchura max. (en metros)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Longitud max. (en metros)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rotonda" @@ -13917,5 +15079,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 "Editar una intersección" @@ -13931,5 +15093,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" #. @@ -13937,9 +15099,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 "Tipo" @@ -13959,10 +15121,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 "Autopista" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "Acceso a autopista" @@ -13984,10 +15146,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 "Carretera principal" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "Enlace a carretera principal" @@ -14009,10 +15171,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 "vía primaria" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "acceso a vía primaria" @@ -14034,5 +15196,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" @@ -14047,9 +15209,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "carretera local" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "carretera sin denominación" @@ -14063,9 +15225,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "calle urbana" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "calle residencial" @@ -14095,10 +15257,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 "vía de servicio" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "carril bus guiado" @@ -14128,6 +15290,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 "en construcción" @@ -14138,10 +15300,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 "Editar un puente" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Editar túnel" @@ -14149,19 +15311,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Vías" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "En construcción" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Editar una vía en construcción" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Intersección" @@ -14177,5 +15339,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rotonda" @@ -14184,5 +15346,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Camino de herradura" @@ -14190,5 +15352,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Editar camino de herradura" @@ -14196,5 +15358,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Vía ciclable" @@ -14204,11 +15366,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 "Editar vía ciclable" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Calle peatonal" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Vía peatonal" @@ -14217,11 +15385,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Editar vía peatonal" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pinchos" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Calle peatonal" @@ -14230,5 +15404,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Editar una vía peatonal" @@ -14236,5 +15410,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Escaleras" @@ -14244,5 +15418,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 "Editar tramo de escaleras" @@ -14251,5 +15425,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Pista" @@ -14258,39 +15432,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Editar una pista" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "hormigón" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "grava" - -#. 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 "suelo" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "hierba" - -#: 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 "arena" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Pista de grado 1 (pavimentada)" @@ -14299,5 +15445,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Editar pista de grado 1 (pavimentada)" @@ -14305,5 +15451,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Pista de grado 2 (de áridos o zahorra)" @@ -14312,5 +15458,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Editar pista de grado 2 (de áridos o zahorra)" @@ -14318,5 +15464,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)" @@ -14325,5 +15471,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)" @@ -14331,5 +15477,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)" @@ -14338,5 +15484,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)" @@ -14344,5 +15490,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)" @@ -14351,5 +15497,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -14359,5 +15505,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Camino" @@ -14366,19 +15512,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Editar camino" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Esquí" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Trineo" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Esquí" - #. 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 "Sendero" @@ -14388,5 +15537,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 "Editar sendero" @@ -14394,5 +15543,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Sendero de montaña" @@ -14402,5 +15551,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 "Editar sendero de montaña" @@ -14408,5 +15557,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Sendero de montaña exigente" @@ -14416,5 +15565,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 "Editar sendero de montaña exigente" @@ -14422,5 +15571,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Sendero alpino" @@ -14430,5 +15579,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 "Editar sendero alpino" @@ -14436,5 +15585,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Sendero alpino exigente" @@ -14444,5 +15593,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 "Editar sendero de montaña exigente" @@ -14450,5 +15599,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Sendero alpino difícil" @@ -14458,5 +15607,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 "Editar sendero alpino difícil" @@ -14464,10 +15613,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Nodos de Vía" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Salida de autopista" @@ -14475,15 +15624,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Editar salida de autopista" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Número" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Servicios" @@ -14491,5 +15640,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Editar estación de servicio" @@ -14503,4 +15652,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" #. @@ -14520,18 +15671,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 "Operador" @@ -14540,5 +15693,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Semáforo" @@ -14548,5 +15701,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Tipo de cruce peatonal" @@ -14555,27 +15708,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 "sin supervisión" -#: 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 "semáforos" -#: 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 "isla" -#: 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 "sin marcar" #. 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 "Cruce de caballos" @@ -14583,6 +15736,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 "Cruce de bicicletas" @@ -14591,11 +15744,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 "Guarda cruces" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Tipo de nombre de cruce (Reino Unido)" @@ -14603,30 +15756,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 "cebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelícano" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "tucán" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "frailecillo" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegaso" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tigre" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stop" @@ -14634,5 +15787,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Paso peatonal" @@ -14641,14 +15794,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Editar cruce" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Tipo de nombre (Reino Unido)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "mini-rotonda" @@ -14659,14 +15812,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 "Dirección" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "agujas del reloj" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Círculo de giro" @@ -14676,20 +15829,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 "Límite de ciudad" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Editar la señal de límite de ciudad" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Nombre alternativo" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Radar de tráfico" @@ -14697,5 +15850,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Teléfono de emergencia" @@ -14703,5 +15856,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Pendiente" @@ -14709,5 +15862,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Pendiente pronunciada" @@ -14716,10 +15869,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Vado" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Editar vado" @@ -14727,5 +15880,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Puerto de montaña" @@ -14733,5 +15886,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Editar puerto de montaña" @@ -14739,11 +15892,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 "Altitud" @@ -14751,5 +15904,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barreras" @@ -14757,5 +15910,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Bolardo" @@ -14763,5 +15916,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Editar un bolardo" @@ -14806,16 +15959,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 "Tráfico permitido:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Barrera para bicicletas" @@ -14824,5 +15977,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Bloques" @@ -14830,5 +15983,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Barrera canadiense" @@ -14836,10 +15989,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Editar barrera canadiense" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Trampa para coches" @@ -14847,15 +16000,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pinchos" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Editar pinchos" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Cabina de peaje" @@ -14863,5 +16016,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Editar cabina de peaje" @@ -14869,10 +16022,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Aduana" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Editar aduana" @@ -14882,5 +16035,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Seto" @@ -14889,5 +16042,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Valla o cerca" @@ -14896,5 +16049,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Muro" @@ -14902,5 +16055,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Muralla" @@ -14909,5 +16062,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Muro de contención" @@ -14919,15 +16072,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Entrada" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Editar una entrada" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Puerta" @@ -14935,50 +16088,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Editar puerta" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Barrera" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Editar una barrera" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Portilla de malla metálica" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Editar portilla de malla metálica" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Banda reductora de velocidad" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Editar banda reductora de velocidad" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Portilla giratoria" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Editar portilla giratoria" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Escalera de paso" @@ -14986,25 +16139,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Editar una escalera de paso" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1017 +#: build/trans_presets.java:1022 msgid "Turnstile" -msgstr "" - -#. item -#: build/trans_presets.java:1018 +msgstr "Torno" + +#. item +#: build/trans_presets.java:1023 msgid "Edit Turnstile" -msgstr "" +msgstr "Editar torno" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1026 +#: build/trans_presets.java:1031 msgid "Sally Port" msgstr "Poterna" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Editar poterna" @@ -15015,10 +16168,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 "Lámina de agua" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Fuente" @@ -15026,5 +16179,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Editar fuente" @@ -15032,5 +16185,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Desagüe" @@ -15038,10 +16191,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Editar canal de desagüe" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Riachuelo" @@ -15049,10 +16202,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "editar un riachuelo" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Canal" @@ -15060,10 +16213,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Editar un canal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Río" @@ -15073,5 +16226,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 "Editar un río" @@ -15079,15 +16232,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Editar lámina de agua" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Suelo" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Editar suelo" @@ -15095,15 +16248,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Cuenca" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Editar cuenca" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Embalse" @@ -15111,15 +16264,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Editar embalse" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Depósito de agua" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Editar depósito de agua" @@ -15127,5 +16280,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Ribera (para orillas de ríos anchos)" @@ -15134,10 +16287,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Editar ribera" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Pantano" @@ -15148,14 +16301,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 "Editar pantano" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Ciénaga" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "ciénaga" @@ -15169,35 +16322,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "marísma" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "juncal" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "saladar" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "superficie mareal" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "manglar" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Lodazal" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Editar lodazal" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Playa" @@ -15205,20 +16358,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Editar playa" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Bahía" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Editar bahía" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Acantilado" @@ -15226,10 +16379,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Editar acantilado" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Línea de costa" @@ -15237,5 +16390,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Editar línea de costa" @@ -15243,5 +16396,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Ruta de ferry" @@ -15249,5 +16402,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Editar una ruta de ferry" @@ -15256,5 +16409,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Astillero" @@ -15262,10 +16415,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Editar un astillero" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Muelle" @@ -15273,5 +16426,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Editar un muelle" @@ -15279,5 +16432,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Presa" @@ -15285,15 +16438,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Editar una presa" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Nodo en vía fluvial" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Esclusa" @@ -15302,5 +16455,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Represa" @@ -15308,20 +16461,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Editar una represa" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Cascada" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Editar una cascada" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Ensanche para giro" @@ -15330,15 +16483,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Puerto deportivo" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Editar puerto deportivo" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Embarcadero" @@ -15346,10 +16499,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Editar embarcadero" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Terminal de ferry" @@ -15357,10 +16510,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Editar la terminal de ferry" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Rampa" @@ -15370,5 +16523,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 "Editar rampa" @@ -15376,10 +16529,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Ferrocarril" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Vía de tren" @@ -15387,5 +16540,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Ediar vía de tren" @@ -15415,8 +16568,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 "Tipos opcionales" @@ -15430,35 +16583,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 "yarda" -#: 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 "vía muerta" -#: 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 "ramal" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Vía estrecha" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Editar vía estrecha" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monoraíl" @@ -15466,45 +16619,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Editar monoraíl" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Vía para tren histórico" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Editar vía para tren histórico" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Metro ligero" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Editar metro ligero" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Editar metro" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tranvía" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Editar tranvía" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Vía para autobús guiado" @@ -15512,5 +16665,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Editar vía para autobús guiado" @@ -15519,14 +16672,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Vía de tren en desuso" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Editar vía de tren en desuso" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Vía de tren abandonada" @@ -15535,5 +16688,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Paso a nivel" @@ -15542,5 +16695,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Paso a nivel peatonal" @@ -15550,5 +16703,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Tipo de paso" @@ -15556,5 +16709,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Plataforma de giro" @@ -15563,10 +16716,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Remonte" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Telesilla" @@ -15574,10 +16727,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Editar telesilla" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Telearrastre" @@ -15585,10 +16738,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Editar telearrastre" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Telecabina" @@ -15596,10 +16749,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Ediatr telecabina" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Góndola" @@ -15607,5 +16760,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Editar góndola" @@ -15613,5 +16766,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 "Estación" @@ -15622,10 +16775,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 "Editar Estación" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Gasolinera" @@ -15635,9 +16788,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 "Ediatr gasolinera" #. 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 "Horario de apertura" + +#. 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" @@ -15657,106 +17039,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Editar aparcamiento" #. 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 "Número de referencia" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "de pisos" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "al aire libre" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "subterráneo" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "estacionamientos Park and Ride" + +#. 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 "De pago" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Capacidad (Coches)" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Plazas para Personas de Movilidad Reducida" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Plazas para Personas de Movilidad Reducida" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Plazas para Personas de Movilidad Reducida" + +#: 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 "Limpieza" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Editar lavado de vehículos" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Concesionario" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Editar concesionario de automóviles" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Taller" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Editar reparación de automóviles" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Alquiler" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Editar alquiler de automóviles" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Compartido" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Editar automóviles compartidos" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Editar aparcamiento para bicicletas" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Capacidad (Coches)" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "al aire libre" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "de pisos" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "subterráneo" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "estacionamientos Park and Ride" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Plazas para Personas de Movilidad Reducida" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "De pago" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Limpieza" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Editar lavado de vehículos" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Concesionario" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Editar concesionario de automóviles" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Taller" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Editar reparación de automóviles" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Alquiler" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Editar alquiler de automóviles" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Compartido" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Editar automóviles compartidos" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Editar aparcamiento para bicicletas" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Editar alquiler de bicicletas" @@ -15765,15 +17182,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Editar tienda de bicicletas" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transporte público" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Referencia" @@ -15781,5 +17198,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Apeadero de ferrocarril" @@ -15787,5 +17204,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Editar apeadero" @@ -15793,5 +17210,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Parada de tranvía" @@ -15800,5 +17217,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Editar parada de tranvía" @@ -15806,5 +17223,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Andén de ferrocarril" @@ -15813,5 +17230,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Editar andén de ferrocarril" @@ -15823,5 +17240,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 "Referencia (número de pista)" @@ -15829,10 +17246,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 "Área" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Boca de metro" @@ -15841,10 +17258,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Editar boca de metro" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Silla de ruedas" @@ -15853,5 +17270,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Estación de autobús" @@ -15860,5 +17277,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Editar estación de autobús" @@ -15866,5 +17283,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Parada de autobús" @@ -15874,5 +17291,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 "Editar parada de autobús" @@ -15881,8 +17298,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 "Refugio" @@ -15890,10 +17305,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Andén de autobús" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Editar andén de autobús" @@ -15901,5 +17316,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15907,5 +17322,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Editar parada de taxi" @@ -15913,5 +17328,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Aeropuerto" @@ -15919,15 +17334,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Editar Aeropuerto" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15936,5 +17351,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Alojamiento" @@ -15946,5 +17361,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -15953,15 +17368,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Editar hotel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Estrellas" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -15969,20 +17384,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Editar motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Pensión" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Editar pensión" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Chalet" @@ -15990,10 +17405,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Editar chalet" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Albergue" @@ -16001,30 +17416,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Editar albergue" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Cabaña alpina" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Editar cabaña alpina" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Zona de caravanas" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Editar zona de caravanas" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Lugar de acampada" @@ -16032,10 +17447,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Editar lugar de acampada" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Comida+Bebidas" @@ -16046,5 +17461,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurante" @@ -16052,5 +17467,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Editar restaurante" @@ -16058,5 +17473,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 "Cocina" @@ -16064,61 +17479,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 "italiano" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chino" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizzería" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburguesería" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "griego" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "alemán" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "india" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turco" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiático" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "tailandés" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexicano" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japonés" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Establecimiento de comida rápida" @@ -16126,9 +17541,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Editar establecimiento de comida rápida" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Cafetería" @@ -16136,10 +17551,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Editar cafetería" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Bar" @@ -16147,20 +17561,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Editar bar" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Editar biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16168,10 +17580,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Editar Bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Club nocturno" @@ -16179,33 +17590,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Editar club nocturno" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turismo" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Atracción" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Editar atracción" -#. 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 "Horario de apertura" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museo" @@ -16213,10 +17615,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Editar museo" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16225,10 +17626,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Editar zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Panorámica" @@ -16236,25 +17636,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Editar panorámica" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Torre de vigía" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Parque temático" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Editar parque temático" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Trabajo artístico" @@ -16262,5 +17661,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Editar trabajo artístico" @@ -16268,86 +17667,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Oficina de información" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Editar oficina de información" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Tipo de Mapa" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "mapa" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "callejero" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "topoguía" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "mapa ciclable" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "calle" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chino" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Descargar área" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Pegar" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Ciudad (>100.000 hab.)" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regional" #. 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 "Descripción detallada" #. 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 "Ciclismo" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Sendero de montaña" + +#. 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 "Esquí" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "vía muerta" + +#. 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 "Panel informativo" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Tipo de Cartel" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "cartel" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Aduana" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "novato" + +#: build/trans_presets.java:1737 msgid "history" msgstr "historia" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "naturaleza" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "vida salvaje" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "uso del suelo" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Hito direccional (excursionismo)" -#. 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 "Información" + +#. 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 "Descripción detallada" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Número de teléfono" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Otros Puntos de Información" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Editar refugio" @@ -16355,25 +17879,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 "Barbacoa" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Zona de picnic" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Editar zona de picnic" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Lugares históricos" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Castillo" @@ -16382,20 +17906,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Editar castillo" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruinas" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Editar ruinas" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Lugar arqueológico" @@ -16404,10 +17927,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Editar lugar arqueológico" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Campo de batalla" @@ -16415,5 +17937,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Editar campo de batalla" @@ -16421,15 +17943,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monumento" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Editar monumento" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Monumento conmemorativo" @@ -16437,45 +17959,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Editar monumento conmemorativo" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Crucero" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Editar crucero" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Humilladero" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Editar humilladero" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Ocio" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Parque acuático" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Editar parque acuático" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Zona de juegos" @@ -16483,15 +18005,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Editar zona de juegos" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Pesca" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Editando pesca" @@ -16499,15 +18021,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Instalaciones deportivas" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Estadio" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Editar estadio" @@ -16521,6 +18043,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 "seleccionar deporte:" @@ -16912,30 +18434,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 "deporte" @@ -16945,227 +18467,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 "diversos" -#: 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 "tiro con arco" -#: 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 "atletismo" -#: 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 "fútbol australiano" -#: 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 "béisbol" -#: 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 "baloncesto" -#: 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 "boules" -#: 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 "bolos" -#: 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 "piragua" -#: 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 "escalada" -#: 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 "cricket" -#: 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 "Cricket con redes" -#: 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 "croquet" -#: 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 "ciclismo" -#: 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 "carrera de perros" -#: 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 "hípica" -#: 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 "fútbol" -#: 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 "golf" -#: 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 "gimnasia" -#: 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 "hockey" -#: 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 "carrera de caballos" -#: 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 "motor" -#: 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 "pelota vasca" -#: 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 "raqueta" -#: 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 "rugby" -#: 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 "tiro" -#: 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 "monopatín" -#: 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 "patinaje" -#: 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 "esquí" -#: 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 "Fútbol" -#: 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 "natación" -#: 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 "tenis de mesa" -#: 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 "tenis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Polideportivo" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Editar polideportivo" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Campo de juego" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Editar campo de juego" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Pista de carreras" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Editar pista de carreras" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Campo de golf" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Editar campo de golf" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Mini golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Editar mini golf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Deporte" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Multi" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Editar multi" @@ -17204,248 +18724,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 "campo de juego" -#: 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 "Polideportivo" -#: 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 "Estadio" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Editar bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletismo" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Editar atletismo" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Tiro con arco" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Editar tiro con arco" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Alpinismo" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Editar alpinismo" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Piragüismo" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Editar piragüismo" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Ciclismo" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Editar ciclismo" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Carreras de perros" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Editar carreras de perros" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Hípica" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Editar hípica" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Carreras de caballos" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Editar carreras de caballos" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gimnasia" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Editar gimnasia" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Deportes de motor" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Editar deportes de motor" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Patinaje" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Editar patinaje" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Monopatín" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Editar monopatín" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Natación" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Editar natación" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Esquí" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Editar esquí" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Tipo de pista de esquí" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "de descenso" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "nórdico" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "parque de snowboard" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Dificultad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "novato" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "fácil" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "intermedio" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "avanzado" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "experto" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "fuera de pista" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Tiro" @@ -17453,178 +18965,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Editar tiro" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Deporte (Pelota)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fútbol" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Editar fútbol" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Fútbol americano" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Editar fútbol americano" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Fútbol australiano" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Editar fútbol australiano" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Béisbol" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Editar béisbol" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Baloncesto" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Editar baloncesto" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Editar golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "campo de golf" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Editar boule" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bolos" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Editar bolos" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Edit cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricket con redes" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Editar cricket con redes" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Editar croquet" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Editar hockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota vasca" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Editar pelota vasca" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Raqueta" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Editar raqueta" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Editar rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Ping-pong" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Editar ping-pong" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tenis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Editar tenis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Edificios" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Edificio" @@ -17632,5 +19144,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Edificio público" @@ -17638,10 +19150,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Editar edificio público" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Ayuntamiento" @@ -17649,10 +19161,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Editar ayuntamiento" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Embajada" @@ -17660,10 +19172,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Editar embajada" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Juzgado" @@ -17672,10 +19184,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Editar juzgado" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Prisión" @@ -17684,10 +19196,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Editar prisión" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Policía" @@ -17697,10 +19209,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 "Editar policía" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Parque de bomberos" @@ -17709,10 +19221,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Editar parque de bomberos" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Oficina postal" @@ -17720,5 +19232,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Editar oficina postal" @@ -17726,15 +19238,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Jardín de infancia" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Editar jardín de infancia" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Escuela" @@ -17742,10 +19254,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Editar escuela" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universidad" @@ -17753,10 +19265,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Editar universidad" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Instituto de enseñanza secundaria" @@ -17764,5 +19276,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Editar instituto de enseñanza secundaria" @@ -17770,5 +19282,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Cine" @@ -17777,10 +19289,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Editar cine" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Biblioteca" @@ -17789,10 +19301,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Editar biblioteca" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Centro de arte" @@ -17800,10 +19311,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Editar centro de arte" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teatro" @@ -17812,10 +19323,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Editar teatro" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Lugar de culto" @@ -17825,5 +19336,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 "Editar lugar de culto" @@ -17832,6 +19343,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 "Religión" @@ -17840,66 +19351,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 "bahaísta" -#: 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 "budista" -#: 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 "cristiana" -#: 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 "hindú" -#: 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 "jainista" -#: 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 "judía" -#: 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 "musulmana" -#: 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 "sijista" -#: 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 "espiritualista" -#: 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 "taoista" -#: 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 "unitarismo" -#: 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 "zoroástrica" -#: 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 "Confesión" @@ -17908,81 +19419,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 "anglicano" -#: 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 "baptista" -#: 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 "católico" -#: 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 "evangélico" -#: 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 "testigos de Jehová" -#: 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 "luterano" -#: 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 "metodista" -#: 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 "mormón" -#: 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 "ortodoxo" -#: 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 "pentecostal" -#: 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 "presbiteriano" -#: 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 "protestante" -#: 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 "cuáquero" -#: 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 "chiita" -#: 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 "suní" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Direcciones" @@ -17991,5 +19502,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Editar direcciones" @@ -17997,5 +19508,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Número de portal" @@ -18003,20 +19514,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nombre del edificio" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Nombre de la ciudad" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Código postal" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Código del país" @@ -18024,5 +19535,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Direcciones interpoladas" @@ -18031,5 +19542,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Editar direcciones interpoladas" @@ -18037,71 +19548,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Esquema numérico" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "impares" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "pares" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "todos" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alfabético" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Construcciones" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fábrica" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Editar fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Torre" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Editar torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Torre de agua" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Editar torre de agua" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasómetro" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Editar gasómetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Faro" @@ -18109,10 +19616,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Editar faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Molino de viento" @@ -18120,10 +19627,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Editar molino de viento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Tubería" @@ -18131,10 +19638,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Editar tubería" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Depuradora" @@ -18144,10 +19651,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 "Editar depuradora" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Grúa" @@ -18155,10 +19662,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Editar grúa" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Baliza" @@ -18166,10 +19673,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Editar baliza" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Vértice geodésico" @@ -18177,10 +19684,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Editar vértice geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Cámara de vigilacia" @@ -18188,5 +19695,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Editar cámara de vigilancia" @@ -18194,5 +19701,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Generador de energía" @@ -18202,39 +19709,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 "Editar generador de energía" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "eólico" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hidráulico" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fósil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "carbón" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "fotovoltaico" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Central eléctrica" @@ -18243,10 +19750,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Editar central eléctrica" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Subestación eléctrica" @@ -18255,5 +19762,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Editar subestación eléctrica" @@ -18261,10 +19768,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 "Línea de referencia" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Torre de electricidad" @@ -18275,5 +19782,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 "Editar torre de electricidad" @@ -18281,5 +19788,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Tendido eléctrico" @@ -18288,46 +19795,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Editar tendido eléctrico" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Voltaje" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Número de cables" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Servicios" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Baños" -#. 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 "Número de referencia" - #. 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 "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Buzón de correos" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Teléfono" @@ -18336,5 +19837,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Editar teléfono" @@ -18342,5 +19843,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 "Monedas" @@ -18348,5 +19849,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 "Billetes" @@ -18354,5 +19855,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 "Tarjetas de recarga y monederos electrónicos" @@ -18360,5 +19861,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 "Tarjetas de débito" @@ -18366,15 +19867,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 "Tarjetas de crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Tarjetas telefónicas" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Reciclaje" @@ -18383,5 +19884,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Editar punto limpio" @@ -18389,80 +19890,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Baterías" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Envases" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Ropas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Vidrio" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Chatarra" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Banco" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Apostadero de caza" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Editar apostadero de caza" -#. 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 "Altura" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "profundidad" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "media" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "total" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Oculto" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Esclusa" -#. 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 "Altura" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "profundidad" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "media" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "total" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fuente" @@ -18471,10 +19968,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Editar fuente" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Agua potable" @@ -18483,10 +19980,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Editar agua potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Caja tibia" @@ -18494,25 +19991,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Editar caja tibia" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Tiendas" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermercado" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Editar supermercado" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Chalet" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Editar chalet" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Tienda de alimentación" @@ -18520,10 +20027,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Editar tienda de alimentación" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosko" @@ -18531,10 +20037,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Editar kiosko" -#. 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 "Editar parada de autobús" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Editar árbol" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Máquina expendedora" @@ -18542,5 +20067,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Editar máquina expendedora" @@ -18548,88 +20073,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Expendedor automático de productos" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "billetes de de transporte público" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "abonos de transporte público" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "billetes de aparcamiento" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "Alimentación" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "Bebidas" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "Caramelos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "Estanco" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "comida para animales" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "Periódicos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "juguetes" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "sellos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "Tarjetas SIM" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "Tarjetas telefónicas" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "Bonos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "condones" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampones" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "Bolsas para excrementos" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Tarjetas de fidelización o descuento" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Carnicería" @@ -18637,10 +20162,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Editar carnicería" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Panadería" @@ -18648,10 +20172,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Editar panadería" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Floristería" @@ -18659,20 +20182,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Editar floristería" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Tienda de productos orgánicos" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Editar tienda de productos orgánicos" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Tienda de bebidas alcohólicas" @@ -18680,60 +20201,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Editar tienda de bebidas alcohólicas" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Bebidas" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Editar tienda de bebidas" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Computador" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Editar tienda de computadores" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Electrónica" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Editar tienda de electrónica" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Editar Tienda Hifi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Muebles" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Editar mueblería" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Centro de jardinería" @@ -18741,10 +20256,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Editar centro de jardinería" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Hardware" @@ -18752,10 +20266,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Editar almacén de hardware" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Almacén de bricolaje" @@ -18763,60 +20276,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Editar almacén de bricolaje" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Papelería" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Editar papelería" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Peluquería" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Editar peluquería" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Zapatos" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Editar zapatería" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Juguetes" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Editar juguetería" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Editar tienda de videos" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Tintorería" @@ -18824,10 +20331,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Editar tintorería" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Lavandería" @@ -18835,10 +20341,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Editar lavandería" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Tienda de actividades al aire libre" @@ -18846,35 +20351,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Editar tienda de actividades al aire libre" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Deportes" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Editar tienda de material de deportes" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Óptica" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Editar óptica" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Dinero en efectivo" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banco" @@ -18882,16 +20384,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Editar banco" -#. 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 "Cajero automático" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Cambio de moneda" @@ -18899,5 +20399,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Editar cambio de moneda" @@ -18905,15 +20405,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Editar cajero automático" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Centro médico" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Médico" @@ -18921,20 +20421,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Editar médico" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dentista" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Editar dentista" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Farmacia/Parafarmacia" @@ -18942,5 +20440,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Editar farmacia/parafarmacia" @@ -18948,10 +20446,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Expende con receta médica" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Hospital" @@ -18959,10 +20456,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Editar hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Punto de acceso para emergencias" @@ -18971,5 +20468,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Editar punto de acceso para emergencias" @@ -18978,20 +20475,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Número de punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Nombre del Punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Número de teléfono" #. 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 "(Utilizar código internacional, como +12-345-67890)" @@ -18999,5 +20496,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 "Veterinario" @@ -19006,55 +20503,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Editar veterinario" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Editar continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "País" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Editar país" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Estado/Provincia" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Editar estado/provincia" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Región" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Editar región" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Municipio" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Editar municipio" @@ -19062,15 +20559,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Ciudad (>100.000 hab.)" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Editar ciudad (>100.00 hab.)" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Ciudad (10.000 - 100.000 hab.)" @@ -19078,10 +20575,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Editar ciudad (10.000 - 100.000 hab.)" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "" @@ -19091,5 +20588,5 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "" @@ -19098,15 +20595,15 @@ #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Población (< 10.000 hab.)" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Editar población (< 10.000 hab.)" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "" @@ -19114,5 +20611,5 @@ #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "" @@ -19122,5 +20619,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Paraje" @@ -19128,10 +20625,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Editar paraje" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Isla" @@ -19139,11 +20636,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Editar isla" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "Izquierda" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Editar chalet" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Entrada de cueva" @@ -19151,10 +20661,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Editar entrada de cueva" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Pico" @@ -19162,10 +20672,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Editar pico" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Glaciar" @@ -19173,10 +20683,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Editar glaciar" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Volcán" @@ -19184,70 +20694,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Editar volcán" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Fronteras" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nacional" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Editar frontera nacional" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrativa" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Editar frontera administrativa" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Editar frontera civil" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Político" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Editar frontera política" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Parque Nacional" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Editar límites del parque nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Uso del suelo" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Árbol" @@ -19256,15 +20766,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Editar árbol" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Nombre botánico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Bosque" @@ -19273,5 +20783,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Editar bosque" @@ -19279,17 +20789,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 "conífera" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "caducifolio" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "mixto" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Plantación forestal" @@ -19298,14 +20808,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Editar zona forestal" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Reserva natural" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Editar reserva natural" @@ -19313,25 +20823,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Pedregal" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Editar pedregal" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Matorral" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Editar matorral" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Braña" @@ -19339,10 +20849,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Editar braña" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Brezal o landa" @@ -19350,5 +20860,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Editar brezal o landa" @@ -19356,5 +20866,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Edificio agrario" @@ -19363,45 +20873,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Tierra de labranza" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Editar tierra de labranza" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Prado" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Editar prado" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Viñedo" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Editar viñedo" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Huertos de ocio" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Editar zona de huertos de ocio" @@ -19409,25 +20919,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Jardín" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Editar jardín" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Pastizal" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Editar pastizal" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Parque municipal" @@ -19435,10 +20945,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Editar parque municipal" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)" @@ -19446,20 +20956,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Editar espacio de uso común" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Parque" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Editar parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Área de esparcimiento" @@ -19467,5 +20977,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Editar área de esparcimiento" @@ -19473,15 +20983,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Área residencial" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Editar suelo residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Cementario" @@ -19489,9 +20999,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Editar cementerio" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cementerio" @@ -19499,39 +21009,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Editar cementerio" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Comercios" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Editar comercios" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Oficinas" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Editar oficinas" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Editar suelo industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Zona ferroviaria" @@ -19539,15 +21049,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Editar zona ferroviaria" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militar" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Editar área militar" @@ -19555,55 +21065,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Zona en construcción" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Editar zona en construcción" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Baldío" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Editar terreno baldío" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Suelo en construcción" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Editar suelo en contrucción" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Vertedero" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Editar vertedero" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Cantera" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Editar cantera" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolígono" @@ -19613,5 +21123,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 "Editar multipolígono" @@ -19620,10 +21130,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "segmento exterior" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "segmento interior" @@ -19631,5 +21141,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Restricción de giro" @@ -19638,5 +21148,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Editar restricción de giro" @@ -19644,34 +21154,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Restricción" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "prohibido girar a la izquierda" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "prohibido girar a la derecha" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "prohibido continuar recto" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "prohibido giro en U" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "solo giro a la derecha" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "solo giro a la izquierda" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "solo recto" @@ -19680,15 +21190,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "desde la vía" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "a través de nodo o vía" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "a la vía" @@ -19696,5 +21206,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Ruta" @@ -19703,5 +21213,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Editar ruta" @@ -19709,5 +21219,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Tipo de ruta" @@ -19779,5 +21289,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 @@ -19786,17 +21296,17 @@ msgstr "bicicleta" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "carretera" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19849,5 +21359,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 @@ -19856,13 +21366,13 @@ msgstr "pie" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "senderismo" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tranvía" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "desvío" @@ -19876,10 +21386,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Descripción del símbolo" @@ -19887,31 +21397,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Red" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "Route state" -msgstr "" +msgstr "Ruta estatal" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "proposed" msgstr "Propuesto" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "Suplente" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporal" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "Conexión" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Color (hex)" @@ -19920,30 +21430,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "segmento de la ruta" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "segmento siguiente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "segmento anterior" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "punto de detención" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "próximo punto de parada" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "anterior punto de parada" @@ -20381,11 +21891,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 "obsoleto" @@ -20710,42 +22220,5 @@ #: build/trans_style.java:542 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 "calle" +msgstr "Autovía" #. color street @@ -22446,5 +23919,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 "agua (claro)" @@ -23043,55 +24516,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23105,5 +24529,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 "turismo" @@ -23175,8 +24599,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 "patrimonio histórico" @@ -23247,8 +24671,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 "zona verde" @@ -23262,5 +24686,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "cantera" @@ -23274,5 +24698,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "vertedero" @@ -23294,5 +24718,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "cuenca" @@ -23306,5 +24730,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "plantación forestal" @@ -23318,5 +24742,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "edificio agrario" @@ -23339,5 +24763,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "venta al por menor" @@ -23351,5 +24775,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industrial" @@ -23363,5 +24787,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "área postindustrial degradada" @@ -23375,5 +24799,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "área rururbana" @@ -23387,5 +24811,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "zona ferroviaria" @@ -23442,7 +24866,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 "zona militar" @@ -23456,5 +24880,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cementerio" @@ -23467,5 +24891,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "pico" @@ -23480,5 +24904,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "glaciar" @@ -23492,5 +24916,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "volcán" @@ -23545,8 +24969,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 "espacio natural" @@ -23560,5 +24984,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "matorral" @@ -23572,20 +24996,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "monte" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "bosque" - #. color water #. 1 @@ -23596,5 +25008,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "lodazal" @@ -23608,5 +25020,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "playa" @@ -23684,8 +25096,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 "ruta" @@ -23733,7 +25145,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 "frontera" @@ -23875,10 +25287,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 "lugar" @@ -23926,6 +25347,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 "dirección" @@ -24222,9 +25643,118 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Seleccione tabla de montaje" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Advertencia: fracasó poner un diálogo siempre al frente. La excepción fue:" +#~ "{0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. " +#~ "Por favor comunique esto como fallo." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ningún documento abierto luego nada por grabar." + +#~ msgid "Change {0} {1}" +#~ msgstr "Cambiar {0} {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Borrar {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Eliminando miembro de relación {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "No se puede abrir el directorio de preferencias: {0}" + +#~ msgid "nodes" +#~ msgstr "nodos" + +#~ msgid "ways" +#~ msgstr "vías" + +#~ msgid "relations" +#~ msgstr "relaciones" + +#~ msgid "changesets" +#~ msgstr "conjuntos de cambios" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Fallo al cargar el historial desde el servidor. Detalles:
{0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas " +#~ "formas?" + +#~ msgid "Delete Layer" +#~ msgstr "Eliminar capa" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "¿Está seguro que quiere eliminar la capa ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Borrar todo" + +#~ msgid "Authors: {0}" +#~ msgstr "Autores: {0}" + +#~ msgid "Public" +#~ msgstr "Público" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Se ha seleccionado hacer públicas sus trazas GPS en openstreetmap.org" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Fijar coordenada Lambert" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo " +#~ "al servidor." + +#~ msgid "Continue anyway" +#~ msgstr "Continuar de todos modos" + +#~ msgid "Copy Default" +#~ msgstr "Copiar por defecto" + +#~ msgid "Edit Information Office" +#~ msgstr "Editar oficina de información" + +#~ msgid "Map Type" +#~ msgstr "Tipo de Mapa" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "citymap" +#~ msgstr "callejero" + +#~ msgid "hikingmap" +#~ msgstr "topoguía" + +#~ msgid "bicyclemap" +#~ msgstr "mapa ciclable" + +#~ msgid "Board Type" +#~ msgstr "Tipo de Cartel" + +#~ msgid "board" +#~ msgstr "cartel" #~ msgid "Move" @@ -24236,7 +25766,4 @@ #~ msgid "Email" #~ msgstr "Correo Electrónico" - -#~ msgid "Not implemented yet." -#~ msgstr "No implementado aún." #~ msgid "Resolve Conflicts" @@ -24663,4 +26190,7 @@ #~ "HREF=\"{1}\">spanish." +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Seleccione tabla de montaje" + #~ msgid "Cannot read numeric value from response" #~ msgstr "No se puede leer el valor numérico de la respuesta" @@ -24796,6 +26326,6 @@ #~ msgstr "Miembros: {0} (enlazados: {1})" -#~ msgid "image loading..." -#~ msgstr "cargando imagen..." +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)" #~ msgid "No data" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 17484) +++ /applications/editors/josm/i18n/po/et.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-17 14:58+0000\n" -"Last-Translator: Margus Värton \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-27 13:04+0000\n" +"Last-Translator: lyyser \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Loon kasutajaliidest" #. 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 "Abi" -#: ../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 "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori" -#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Viga" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest." - -#: ../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] "On salvestamata muudatusi. Tühista muudatused ja jätka?" +msgstr[1] "On salvestamata muudatusi. Tühista muudatused ja jätka?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Salvestamata muudatused" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "On salvestamata muudatusi. Tühista muudatused ja jätka?" - -#: ../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 "Salvesta ja välju" -#: ../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 "Tühista ja välju" -#: ../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 "Loobu" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{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 "Hoiatus" -#: ../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 "Ignoreerin vigast faili URL''i: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Pistikrakendused" @@ -344,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -359,5 +376,5 @@ msgstr "" -#: ../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 "Palun vali sihtkiht." @@ -367,11 +384,11 @@ msgstr "Vali sihtkiht" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Ühenda" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -380,5 +397,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 "Sihtkihte ei ole" @@ -395,11 +412,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 @@ -428,5 +445,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 "Laiuskraad" @@ -435,30 +452,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 "Pikkuskraad" +#: ../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 "Paiguta sõlmed ringikujuliselt." -#: ../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 "Liiguta valitud sõlmed ringiks." -#: ../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 @@ -472,6 +489,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 @@ -479,58 +496,57 @@ msgstr "Tööriist {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 "Palun vali vähemalt neli sõlme." #. 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 "Info" #. 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 "Paiguta sõlmed ühele joonele." -#: ../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 "Liiguta valitud sõlmed ühele joonele." -#: ../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 "Palun vali vähemalt kolm sõlme." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -539,10 +555,10 @@ msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {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 võimaluste rikkumine" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -551,5 +567,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -558,46 +574,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Eeltingimuste rikkumine" -#: ../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} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "andmed" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "kiht" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "valik" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "allalaetule" +#: ../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 "Suumi {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 "Suumi vaade {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 @@ -607,22 +623,22 @@ msgstr "Vaade: {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 "Ei ole valitud midagi, millele suumida" -#: ../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 "Ei ole vastuolusid, millele suumida" +#: ../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 "Sobita tee" -#: ../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 "Sobita mitu teed üheks." -#: ../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 "Palun vali vähemalt kaks teed, mida sobitada." @@ -633,4 +649,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Sobita ikkagi." + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -639,19 +659,7 @@ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Sobita ikkagi." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Muuda suundi?" - -#: ../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 "" -"Teid ei saa praeguste suundadega ühendada. Kas tahad mõned suunad ringi " -"pöörata?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -659,27 +667,34 @@ msgstr "Pööra ja sobita." -#: ../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 "" +"Teid ei saa praeguste suundadega ühendada. Kas tahad mõned suunad ringi " +"pöörata?" + +#: ../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 "Sisesta kõigi vastuolude kohta väärtused." -#: ../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 "Lahenda vastuolud." -#: ../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 "Ühenda {0} teed." -#: ../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 "Kõik teed olid tühjad." -#: ../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 " @@ -687,32 +702,32 @@ msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." +#: ../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 "Kopeeri" -#: ../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 "Kopeeri valitud objektid puhvrisse." -#: ../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 "Palun vali kopeerimiseks mõni objekt." +#: ../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 "Moodusta ring" -#: ../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 "Moodusta valitud kolmest sõlmest ring." -#: ../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 "Sõlmed ei moodusta ringi. Katkestan." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -722,20 +737,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 "Kustuta" @@ -745,85 +760,86 @@ msgstr "Kustuta valitud objektid." -#: ../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 "Ülekirjutamine" -#: ../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 "Fail eksisteerib! Kas kirjutada see üle?" #. 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 "Jaga sõlmed." -#: ../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 "Aseta valitud sõlmed võrdsete vahemaade tagant mööda joont." +#: ../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 "Lae OSM serverist..." -#: ../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 "Lae kaardi andmed OSM serverist" -#: ../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 "Fail: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Lae alla" -#: ../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 "Palun vali allalaadimiseks vähemalt üks toiming." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "Impordi ajal leidis aset {0} konflikti." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Konfliktid allalaadimisel" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -832,6 +848,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 "Kahekordista" @@ -855,85 +871,91 @@ msgstr "Rakenduse sulgemine." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Eraldised" + +#: ../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 "Ekspordi GPX-i..." -#: ../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 "Ekspordi andmed GPX faili." -#: ../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 "Midagi ei ole eksportida." -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58 +msgstr "parameeter ''{0}'' ei tohi olla null" + +#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM võrguabi" -#: ../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 "Ava sirvikus" -#: ../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 "Muuda" -#: ../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 "Lae uuesti" -#: ../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 "Ainult JOSM võrguabi lehekülgi saab toimetada." -#: ../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 "Viga lehekülje {0} laadimisel." -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -985,22 +1007,26 @@ 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 "Liida sõlmed." -#: ../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 "Liida sõlmed vanimaks." -#: ../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 "Palun vali vähemalt kaks sõlme mida liita." -#: ../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 "Liida erineva kuuluvusega sõlmed?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Liida igal juhul." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1008,77 +1034,73 @@ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Liida igal juhul." - -#: ../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 "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel." -#: ../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 "Sulanda {0} sõlm(e)" +#: ../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 "Ühenda valik" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" -msgstr "" - +msgstr "Ühenda valitud primitiivid teise kihti" + +#: ../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 "Peegelda" -#: ../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 "Peegelda valitud sõlmed ja teed." -#: ../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 "Palun vali vähemalt üks sõlm või tee." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "Üles" -#: ../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 "Liiguta objektid {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "Alla" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "Vasakule" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "Paremale" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Liiguta {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 "Liiguta objektid {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 "Objekte ei saa maailmast välja viia" @@ -1086,5 +1108,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 "Uus" @@ -1094,16 +1116,21 @@ msgstr "Loo uus kaart." -#: ../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 "Ava..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Faili avamine." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Faili avamine." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, java-format +msgid "Opening file ''{0}'' ..." msgstr "" @@ -1142,21 +1169,17 @@ msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Ainult kaks sõlme lubatud." -#: ../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 "Valik peab koosnema ainult kahest sõlmest." -#: ../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 "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Palun vali peaaegu täisnurga all kohtuvad teed." - -#: ../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 " @@ -1165,9 +1188,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 "Ainult üks sõlm valitud." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Ristkülikusta." @@ -1183,13 +1206,26 @@ msgstr "Kleebi puhvri sisu." -#: ../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 "Kleebi sildid." -#: ../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 "Lisa kõikidele valitud objektidele puhvris olevad sildid." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Primitiivi uuendamine" +msgstr[1] "Primitiivi uuendamine" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1215,37 +1251,32 @@ msgstr "Tee uuesti viimane tagasivõtmine" -#: ../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 "Nimeta kiht ümber." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Nimeta fail ka ümber." -#: ../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 "" +#: ../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 "Pööra tee suund." -#: ../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 "Pööra kõigi valitud teede suund." -#: ../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 "Palun vali vähemalt üks tee." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Pööra teede suund." @@ -1253,10 +1284,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 "Salvesta" #: ../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 "Salvesta praegused andmed" @@ -1267,37 +1299,25 @@ msgstr "Fail {0} on juba olemas. Kas kirjutan üle?" -#: ../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 "" -"Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun teata " -"sellest veast arendajaid." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Tühi dokument" -#: ../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 "Dokumendis ei ole andmeid." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Salvesta ikkagi." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konfliktid" -#: ../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 " @@ -1307,28 +1327,28 @@ "tagasi. Jätkame?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Lahenda vastuolud ja salvesta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Salvesta OSM fail." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Salvesta GPX fail" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Salvesta kiht" +#: ../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 "Salvesta nimega..." -#: ../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 "Salvesta need andmed uude faili." @@ -1360,33 +1380,33 @@ msgstr "Abi: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Staatus" -#: ../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 "Kopeeri puhvrisse ja sulge." -#: ../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 "Sulge" +#: ../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 "Lahuta tee." -#: ../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 "Lahuta tee valitud sõlme kohalt." -#: ../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 "Valik ei ole lahutamiseks sobiv." -#: ../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." @@ -1394,5 +1414,5 @@ msgstr[1] "Valitud sõlmed ei ole tee keskel." -#: ../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 " @@ -1408,9 +1428,9 @@ "sõlmed kuuluvad" -#: ../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 "Valitud sõlmed ei ole samast teest." -#: ../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." @@ -1418,10 +1438,10 @@ msgstr[1] "Valitud tee ei sisalda valitud sõlmi" -#: ../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 "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada" -#: ../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 " @@ -1431,5 +1451,5 @@ "middle of the way.)" -#: ../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 " @@ -1437,5 +1457,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 " @@ -1443,8 +1463,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 "Lõika tee {0} {1} osaks" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Sulgen muutustekogumit..." + +#: ../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 "Sulgen muutustekogumit..." + +#: ../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 "Avan muutustekogumit..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Sulgen muutustekogumit..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1462,47 +1507,47 @@ msgstr "Näita/peida seade {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 "Kleebi tee uuesti kokku." -#: ../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 "Kahekordista sõlmed, mis on mitme tee poolt kasutatud." -#: ../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 "See on üksik sõlm." -#: ../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 "Ükski neist sõlmedest ei ole millegi küljes." -#: ../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 "Ükski selle tee sõlmedest ei ole millegi muu küljes." -#: ../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 "Seda valikut ei ole võimalik uuestiliitmiseks kasutada." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Vali miski:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* üks sildiga sõlm või" -#: ../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 "* üks sõlm, mis on kasutusel rohkem kui ühes tees või" +#: ../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 "" +"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" + #: ../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 "" -"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" - -#: ../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" @@ -1511,5 +1556,5 @@ "teedest" -#: ../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." @@ -1518,5 +1563,5 @@ "ühes neist teedest" -#: ../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" @@ -1529,9 +1574,9 @@ "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Lahtisulatatud sõlm" -#: ../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" @@ -1539,5 +1584,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" @@ -1581,61 +1626,71 @@ msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)." -#: ../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 "Andmete värskendamine" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Uuenda valik" -#: ../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 +msgstr "Värskendab valitud primitiivid serverist" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 msgid "There are no selected primitives to update." msgstr "Ei ole valitud primitiive mida uuendada." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Tühi valik" -#: ../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 "Lae OSMi serverisse" -#: ../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 "Lae kõik muudatused OSM serverisse üles." -#: ../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 "Lahendamata konfliktid! Sa pead need enne lahendama." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Lahendamata konfliktid! Sa pead need enne lahendama." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Pole muudatusi mida üles laadida." -#: ../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 "Sünkroniseeri ainult {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 "Sünkroniseeri kogu andmekogu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1649,17 +1704,17 @@ msgstr "" -#: ../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 "Avastatud konflikt" #. 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 "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1670,64 +1725,152 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Laadimine OSM API-le ebaõnnestus" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Primitiivi uuendamine" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Kas laen need muudatused üles?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Lae muudatused üles" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Ühenda uus sõlm olemasoleva teega" + +#: ../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 "lae kõik muudatused ühe päringuga" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " "changed primitive" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +"Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja iga " +"muudetud primitiivi kohta eraldi päringu kasutamiseks" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Kaardi seaded" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objektid lisada:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objektid muuta:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objektid kustutada:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Kas laen need muudatused üles?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Lae muudatused üles" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Üleslaadimine" +#: ../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] "Objektid lisada:" +msgstr[1] "Objektid lisada:" + +#: ../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] "Objektid muuta:" +msgstr[1] "Objektid muuta:" + +#: ../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] "Objektid kustutada:" +msgstr[1] "Objektid kustutada:" + +#: ../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 "Viimane muudatus {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1751,20 +1894,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 "Audio: {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 "Kiiremini" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Kiiremini edasi" @@ -1806,10 +1949,10 @@ msgstr "Mängi eelmine järjehoidja" -#: ../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 "Aeglasemalt" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Aeglasemalt edasi" @@ -1837,31 +1980,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 "Andmeid ei imporditud." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Openstreetmapi andmed" -#: ../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 "Laen alla {0} {1}-st ({2} veel)" -#: ../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 +msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 msgid "Errors during Download" msgstr "Viga allaladimise ajal" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1873,20 +2012,20 @@ msgstr "" -#: ../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 "Kustutatud või nihutatud primitiivid" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Kustutusrežiim" -#: ../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 "Kustuta sõlmi või teid" -#: ../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 @@ -1895,5 +2034,5 @@ msgstr "Režiim: {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 " @@ -1901,55 +2040,69 @@ msgstr "" -#: ../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 "" - +msgstr "parameeter ''{0}'' ei tohi olla 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 "Joonistamine" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Sõlmede joonistamine" -#: ../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 @@ -1957,38 +2110,38 @@ msgstr "valitud" -#: ../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 "Sõlme ei saa lisada maailmast väljapoole." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Lisa punkt" -#: ../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 "Lisa teele sõlm" -#: ../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 "Ühenda olemasolev tee sõlmega" -#: ../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 "Ühenda uus sõlm olemasoleva teega" -#: ../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 "Lisa sõlm teele ja ühenda" -#: ../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 "Loo uus sõlm." -#: ../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 "Vali kursori all olev sõlm." -#: ../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." @@ -1997,14 +2150,14 @@ msgstr[1] "Lisa {0} teele uus sõlm." -#: ../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 "Alusta uut teed viimasest sõlmest." -#: ../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 "Jätke teed viimasest sõlmest." -#: ../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 "Lõpeta joonistamine." @@ -2024,5 +2177,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 "" @@ -2034,5 +2187,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 "Pööramise lõpetamiseks vabasta hiire nupp." @@ -2048,17 +2201,18 @@ msgstr "" +#: ../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 "Vali" -#: ../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" @@ -2067,30 +2221,34 @@ msgstr[1] "" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." msgstr "" -#: ../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-" @@ -2113,60 +2271,60 @@ msgstr "" +#: ../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 "Otsi..." -#: ../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 "Otsi objekte." -#: ../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 "Palun sisesta otsingu tekst" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "asenda valik" -#: ../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 "lisa valikusse" -#: ../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 "eemalda valikust" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "tõstutundlik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regulaaravaldis" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2174,109 +2332,109 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" +msgid "modified - all changed objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Otsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Alusta otsingut" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Leitud {0} vastet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2337,58 +2495,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Lae valik" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Allalaadimine..." -#: ../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 "" -#: ../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 "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Lisa punkt" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Seosed: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Muuda {0} objekt" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Viimane muudatus {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Muuda seost" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, java-format +msgid "Remove \"{0}\" for node ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, java-format +msgid "Remove \"{0}\" for way ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../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 +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, java-format +msgid "Set {0}={1} for node ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 +#, java-format +msgid "Set {0}={1} for way ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "" + +#: ../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" @@ -2397,10 +2593,10 @@ msgstr[1] "objektid" -#: ../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 "" -#: ../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}" @@ -2412,5 +2608,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2419,10 +2615,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2431,5 +2627,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}''" @@ -2453,40 +2649,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Kustuta {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Kustuta {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] "Kustuta {0} {1}" +msgstr[1] "Kustuta {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] "Kustutusrežiim" +msgstr[1] "Kustutusrežiim" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Kustuta {0} {1}" +msgstr[1] "Kustuta {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] "{0} seos" +msgstr[1] "{0} seosed" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Konfliktne relatsioon" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" - -#: ../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 +#: ../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:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "" @@ -2494,6 +2706,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." @@ -2502,5 +2714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2511,5 +2723,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2544,10 +2756,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2560,17 +2782,37 @@ msgstr "Jada" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../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 +#, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "" @@ -2595,13 +2837,13 @@ msgstr "" -#: ../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 "" @@ -2620,62 +2862,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 "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Ei suuda avada eelistuste kataloogi: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../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 +#, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" + +#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -2689,29 +2988,36 @@ msgstr "" -#: ../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}" @@ -2723,15 +3029,229 @@ msgstr "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "" + +#: ../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" @@ -2740,22 +3260,7 @@ msgstr[1] "punktid" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "" - -#: ../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" @@ -2764,12 +3269,7 @@ msgstr[1] "teed" -#: ../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" @@ -2778,246 +3278,4 @@ msgstr[1] "seosed" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "" -msgstr[1] "" - -#: ../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} punkt" -msgstr[1] "{0} punkti" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "" - -#: ../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" @@ -3030,5 +3288,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "taust" @@ -3038,5 +3296,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3046,5 +3304,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3055,21 +3313,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3090,8 +3348,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3099,15 +3357,101 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Rohkem ei näidata" -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "" + +#: ../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} punkt" +msgstr[1] "{0} punkti" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "tundmatu" + +#: ../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 "" @@ -3117,36 +3461,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Eelitingimuste rikkumine" -#: ../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 "tundmatu" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3156,9 +3473,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 "" @@ -3167,9 +3484,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3178,9 +3495,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 "" @@ -3190,9 +3518,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Tundmatu host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3202,12 +3530,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitiiv on juba kustutatud" - -#: ../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 @@ -3224,38 +3547,38 @@ msgstr "Laen alla \"päeva sõnumit\"" -#: ../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 "Üleslaadimise valikud" -#: ../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 "Lae käesolikud valikud serverisse" -#: ../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 "tekst" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Kasutajanimi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM salasõna" -#: ../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 "Muuda apleti suurus antud mõõtu (formaat: LAIUSxKÕRGUS)" -#: ../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 "tekst;tekst;..." -#: ../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 " @@ -3265,5 +3588,5 @@ "lat=y&lon=x&zoom=z või failinime" -#: ../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 " @@ -3273,5 +3596,5 @@ "lat=y&lon=x&zoom=z või failinime" -#: ../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 " @@ -3281,75 +3604,94 @@ "mis tagastab osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "iga" -#: ../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 "Kui määratud, lähtestab konfiguratsiooni selle lugemise asemel." -#: ../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 "Kasutajanimi" -#: ../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 "Salasõna" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -3357,47 +3699,47 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Aktiveerin uuendatud pistikrakendused" -#: ../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 "Pistikrakenduste laadimine" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Fail" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Tööriistad" -#: ../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 "Eelseaded" -#: ../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 @@ -3409,21 +3751,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 "Joonvõrgu vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Lülita joonvõrgu vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Täisekraan" -#: ../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 "Heli" @@ -3463,58 +3805,44 @@ msgstr "Vähenda" -#: ../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:94 +msgid "The name of the object at the mouse pointer." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 -msgid "The name of the object at the mouse pointer." +msgid "The geographic latitude at the mouse pointer." +msgstr "" + +#: ../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:98 -msgid "The geographic latitude at the mouse pointer." +msgid "The (compass) heading of the line segment being drawn." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java: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 "kiht ei ole nimekirjas" -#: ../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 "" - -#: ../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 "" @@ -3527,10 +3855,4 @@ 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 "" - #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 msgid "false: the property is explicitly switched off" @@ -3588,7 +3910,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" @@ -3604,5 +3925,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" @@ -3705,5 +4026,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 "" @@ -3714,5 +4035,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" @@ -3726,5 +4047,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 "" @@ -3799,6 +4120,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" @@ -3908,10 +4229,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 "" @@ -3920,19 +4241,19 @@ msgstr "" -#: ../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 "" @@ -3941,5 +4262,5 @@ msgstr "" -#: ../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 "" @@ -3957,9 +4278,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 " @@ -3967,110 +4288,112 @@ 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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4079,21 +4402,21 @@ msgstr "" -#: ../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 "Roll" #: ../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 "" @@ -4132,10 +4455,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 @@ -4144,10 +4468,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 @@ -4161,5 +4486,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}" @@ -4200,4 +4525,140 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "kõik" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Vali värv" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parameeter ''{0}'' ei tohi olla null" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Pole veel teostatud." + +#: ../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 "teelt" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Muuda seost" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konfliktid andmetes" + +#: ../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} tee" +msgstr[1] "{0} teed" + +#: ../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} seos" +msgstr[1] "{0} seosed" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Konfliktne relatsioon" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Lahenda vastuolud." + +#: ../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 "Kleebi" + +#: ../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} tee" +msgstr[1] "{0} teed" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4213,10 +4674,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 @@ -4224,5 +4685,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}" @@ -4253,5 +4714,5 @@ #: ../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." @@ -4259,31 +4720,25 @@ "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja." -#: ../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 "" @@ -4295,150 +4750,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 "Ajalugu" -#: ../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 "Näita kõigi valitud objektide ajalugu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Kaart: {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 "Seosed: {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 "" - -#: ../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 "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja." #. 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 "Kihid" -#: ../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 "Ava kõikide laetud kihtide nimekiri." -#: ../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 "Kustuta valitud kiht" -#: ../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 "" - -#: ../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 "Näita/Peida" -#: ../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 "Muuda valitud kihi nähtavust." -#: ../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 "Liiguta valitud kiht ühe rea võrra üles." -#: ../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 "Liiguta valitud kiht ühe rea võrra alla." -#: ../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." @@ -4447,28 +4870,22 @@ msgstr[1] "See muudab kuni {0} objekti." -#: ../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 "Tühi väärtus kustutab võtme." -#: ../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 "Muuta väärtusi?" -#: ../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" @@ -4477,89 +4894,84 @@ msgstr[1] "Muuda kuni {0} objekti seadeid" -#: ../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 "Palun vali võti" -#: ../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 "Palun vali väärtus" -#: ../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 "Palun vali objektid mille seadeid soovid muuta." -#: ../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 "Seaded/Liikmelisus" -#: ../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 "Valitud objektide seaded" #. 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 "On liikmeks järgnevas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Lisa seaded" -#: ../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 "Lisa" -#: ../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 "Lisa uus võtme/väärtuse paar kõikidele objektidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Seadete muutmine" -#: ../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 "Muuda kõikide valitud objektide võtme väärtust" -#: ../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 "Seaded: {0} / Liikmelisus: {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 "Seaded / Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Muuda seost" -#: ../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 "Tõesti soovid kustutada valikut seosest {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 "Kustuta valitud võti kõkides objektides" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Kustuda seadeid" @@ -4568,34 +4980,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 "Seosed" -#: ../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 "Ava kõikide seoste nimekiri" -#: ../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 "Seosed: {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 "Ava toimetajas valitud seos" -#: ../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 "Kustuta valitud seos" -#: ../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 "Loo uus seos" -#: ../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 "" @@ -4628,23 +5040,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 "Valik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} tee" -msgstr[1] "{0} teed" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} seos" -msgstr[1] "{0} seosed" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4652,14 +5050,9 @@ msgstr "Valik: {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 "Lase paneel vabaks" -#: ../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." @@ -4667,64 +5060,96 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../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 "Vajuta et minimeerida/maksimeerida paneeli sisu" -#: ../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 "Autorid" -#: ../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 "Ava valitud objektiga töötavate inimeste nimekiri." -#: ../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] "Autor" +msgstr[1] "Autor" + +#: ../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 +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 "Rohkem teavet sellest funktsioonist" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objekti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autorid: {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 "Konfliktid andmetes" -#: ../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 "" @@ -4733,47 +5158,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 " @@ -4782,14 +5201,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 "" @@ -4799,9 +5218,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 "" @@ -4811,15 +5230,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4827,5 +5246,5 @@ msgstr "" -#: ../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 " @@ -4833,20 +5252,20 @@ msgstr "" -#: ../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 "" @@ -4855,57 +5274,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 "Liiguta hetkel valitud liiget ülespoole" #. 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 "Liiguta hetkel valitud liiget allapoole" #. 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 " @@ -4914,9 +5333,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 "" @@ -4925,20 +5344,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 @@ -4948,37 +5363,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 "Lae alla kõik sellest seosest puudu olevad teed ja puntid" -#: ../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 "Lae alla liikmed" -#: ../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 "" @@ -4988,30 +5403,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 "" @@ -5025,22 +5440,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 "Pistikrakenduste laadimine" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5073,34 +5493,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Järjehoidjad" -#: ../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 "Palun sisesta enne soovitud kordinaadid." -#: ../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 "Palun sisesta koha nimi." -#: ../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 "Vali enne järjehoidja." @@ -5155,13 +5562,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 "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)." -#: ../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 "Palun sisesta otsingutekst" -#: ../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 "Ei saa lugeda kohaotsingu tulemusi serverist" @@ -5169,18 +5576,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 "Sisesta otsitava koha nimi:" -#. 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 "Asukohad" #. 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 "nimi" @@ -5219,37 +5625,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 "tüüp" -#: ../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 "lähedal" -#: ../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 "suurendus" -#: ../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: " @@ -5258,5 +5664,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 "" @@ -5283,46 +5689,74 @@ msgstr "Pildi numbrid" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Lae käesolikud valikud serverisse" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5641,14 +6075,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5824,8 +6272,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" #. @@ -5922,4 +6376,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6033,6 +6490,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 @@ -6040,153 +6497,171 @@ #: 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 "Nimi" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Muuda seost" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Rohkem teavet sellest funktsioonist" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Viimane muudatus {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6195,32 +6670,285 @@ msgstr "" -#: ../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 "Valik" + +#: ../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 "Palun vali väärtus" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parameeter ''{0}'' ei tohi olla null" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Tühista ja välju" + +#: ../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 "Salvesta ja välju" + +#: ../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 +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 "Fail" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Üleslaadimine" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Ei ole valitud primitiive mida uuendada." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 @@ -6228,29 +6956,29 @@ msgstr "" -#: ../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:587 +#, java-format +msgid "GPS start: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format -msgid "GPS start: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 -#, java-format msgid "GPS end: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#, java-format +msgid "current delta: {0}s" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 -#, java-format -msgid "current delta: {0}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 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" @@ -6259,14 +6987,14 @@ msgstr[1] "pildid" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sünkroniseeri kell" -#: ../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 @@ -6274,82 +7002,82 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Pilt" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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." +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 "Kohanda värvi" -#: ../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 "Vaikimisi" -#: ../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" @@ -6409,5 +7137,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}" @@ -6423,10 +7151,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 "Muuda andme kihiks" #: ../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." @@ -6437,11 +7165,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 @@ -6481,4 +7209,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Andmete allalaadimine" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6497,64 +7230,64 @@ msgstr "" -#: ../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 "Andmekiht {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 "" -#: ../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 "" -#: ../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 "" -#: ../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} kustutatud.)" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -6562,5 +7295,5 @@ msgstr[1] "" -#: ../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" @@ -6568,5 +7301,5 @@ msgstr[1] "punktid" -#: ../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" @@ -6575,5 +7308,5 @@ msgstr[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} consists of {1} track" @@ -6582,5 +7315,5 @@ msgstr[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" @@ -6589,9 +7322,9 @@ msgstr[1] "{0} punkti" -#: ../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 marker" -#: ../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" @@ -6599,5 +7332,5 @@ msgstr[1] "markerid" -#: ../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" @@ -6616,5 +7349,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}." @@ -6622,5 +7355,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 "Ei saa sükroniseerida kihis mis mängib." @@ -6648,5 +7381,5 @@ msgstr "Muuda markertekstide ja ikoonide nähtavust." -#: ../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 " @@ -6654,5 +7387,5 @@ msgstr "" -#: ../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 " @@ -6662,29 +7395,29 @@ "rajapuhktile kuhu sa soovid sünkroniseerida" -#: ../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 "Ei saa uut heli markerit luua." -#: ../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 "Tekkis viga kui prooviti kuvada selle markeri 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 "(URL oli: " -#: ../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 "Viga URL kuvamisel" +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +msgid "Advanced Preferences" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 -msgid "Advanced Preferences" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java: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 @@ -6692,26 +7425,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 "" -#: ../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 "PAlun vali rida muutmiseks" -#: ../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 @@ -6719,14 +7452,14 @@ msgstr "" -#: ../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 "Palun vali rida kustutamiseks" -#: ../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 "" @@ -6849,40 +7582,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 "Värv" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Vali" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Värvid" @@ -6926,5 +7659,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "" @@ -6946,16 +7679,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:" #. @@ -6985,12 +7719,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 "" @@ -7161,5 +7895,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 "" @@ -7167,23 +7901,32 @@ #. 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 "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +msgid "Show localized name in selection lists" +msgstr "" + +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +msgid "Show localized name in selection lists, if available" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Välimus ja tunnetus" @@ -7215,54 +7958,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 "Lae nimekiri alla" -#: ../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 "Uuenda" -#: ../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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Vaateseadistused" -#: ../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 " @@ -7270,41 +8013,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 "Ühenduse sätted" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Kaardi seaded" -#: ../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 "Muudatuste rakendumiseks pead JOSMi taaskäivitama." -#: ../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 "Projektsiooni meetodid" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "" @@ -7336,12 +8079,4 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 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 "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" msgstr "" @@ -7369,61 +8104,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7589,36 +8323,59 @@ 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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Lisa teele sõlm" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Kustuta valitud kiht" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Rohkem teavet sellest funktsioonist" #. 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 "Valikulised tunnused:" -#: ../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 "Kasuta eelseadet ''{0}'' grupist ''{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 "Kasuta eelseadet \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "suletud tee" -#: ../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 "Tundmatu tüüp: {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 @@ -7626,15 +8383,15 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {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 "Viga sõelumisel {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 "Elemente tüübist {0} toetatakse." -#: ../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 @@ -7644,22 +8401,22 @@ msgstr[1] "Muuda {0} objekti" -#: ../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 "Midagi pole valitud!" -#: ../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 "Muuda seadeid" -#: ../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}''" @@ -7698,11 +8455,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 "Ei suutnud lugeda \"{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 " @@ -7710,38 +8467,38 @@ msgstr "Märkus: GPL ei ole OSM litsentsiga ühilduv. Ära lae GPL jälgi üles." -#: ../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 "GPX failid" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "GPS jälje kirjeldus" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Lisa autori informatsioon" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Tegelik nimi" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "E-post" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Autoriõigus (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Eelseadistatud" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Autoriõiguse aasta" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Võtmesõnad" @@ -7751,9 +8508,9 @@ msgstr "Ekspordi suvandid" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Ekspordi ja salvesta" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7764,10 +8521,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 "Vali eeldefineeritud litsents" -#: ../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 @@ -7777,12 +8534,12 @@ msgstr "Markerid {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 "" -#: ../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" @@ -7803,6 +8560,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 @@ -7812,20 +8569,40 @@ msgstr "Laen alla OSM andmeid..." -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 +#, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7833,34 +8610,34 @@ msgstr "" -#: ../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 failid" -#: ../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 "Koordinaadid imporditud: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Vigaselt vormindatud laused: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Kontrollsumma vead: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Tundmatud laused: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Null koordinaadid: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA import oli edukas." -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA impordi viga!" @@ -7871,9 +8648,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7882,15 +8659,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7898,33 +8675,91 @@ msgstr "" -#: ../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 "Avan muutustekogumit..." -#: ../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 "Avan muutustekogumit..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Avan muutustekogumit..." + +#: ../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 "Avan muutustekogumit..." + +#: ../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 "Sulgen muutustekogumit..." -#: ../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 "Sulgen muutustekogumit..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Avan muutustekogumit..." + +#: ../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 "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Üleslaadimine..." -#: ../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}." @@ -7952,42 +8787,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Vale salasõna või kasutajanimi." -#: ../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 "Ettevaatust: Salasõna saadetakse krüpteerimata." -#: ../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 "Salvesta kasutaja ja salasõna (krüpteerimata)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Sisesta salasõna" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM parool" -#: ../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." @@ -7996,20 +8839,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM serveri failid" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8018,5 +8861,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8209,35 +9052,46 @@ msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust." -#: ../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} jäänud. Laen üles {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} jäänud. Laen üles {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} jäänud. Laen üles {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 "Midagi pole üles laadida. Hangi esmalt andmeid." + +#: ../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 "Pistikrakenduste uuendamine" -#: ../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 "" @@ -8250,5 +9104,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." @@ -8257,23 +9111,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8284,30 +9138,30 @@ msgstr "Pistikus {0} tekkis viga" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8315,21 +9169,21 @@ msgstr "" +#: ../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:176 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 -msgid "Disable plugin" +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 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 " @@ -8339,5 +9193,5 @@ "on piisavalt õigusi olemasolevate pistikrakenduste ülekirjutamiseks." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8345,19 +9199,19 @@ msgstr "" -#: ../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 "" -#: ../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." msgstr "" -#: ../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 " @@ -8365,13 +9219,13 @@ msgstr "" -#: ../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" @@ -8382,5 +9236,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" @@ -8389,18 +9243,18 @@ msgstr[1] "Laadisin alla pluginate info {0} saidilt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Pluginate infot ei leitud" -#: ../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 "" -#: ../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 "Kõik installeeritud pluginad on uuendatud." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8413,9 +9267,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 "Lae puuduvad pistikrakendused alla" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8428,35 +9282,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}: Versioon {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 "Plugin kaasatud JOSMi" -#: ../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 "" -#: ../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 "See jääb peale lindistuse lõppu" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Viga heili esitamisel" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Ära tee midagi" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Teata veast" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8466,18 +9320,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Ootamatu erandolukord" -#: ../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 "Palun teata piletiga {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 "Lisa vea tekkimise käik (nii detailselt kui võimalik)!" -#: ../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 " @@ -8487,19 +9341,19 @@ "versioonini." -#: ../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 "Lisa kindlasti järgnev info:" -#: ../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 "(Tekst on juba kopeeritud clipboardi.)" -#: ../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 "" -#: ../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 "" @@ -8508,5 +9362,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8515,5 +9369,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8526,5 +9380,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" @@ -8534,5 +9388,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8543,17 +9397,17 @@ "\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 "(Vihje: Kiirkorraldusi saad muuta seadete alt..)" -#: ../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 "" @@ -8562,4 +9416,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8584,9 +9473,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 @@ -8594,27 +9501,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" +#: ../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}" @@ -8622,47 +9542,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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -8771,19 +9691,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 "" -#: ../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 "" -#: ../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 "Viga {0} parsimisel" -#: ../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." @@ -8792,34 +9712,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -8827,69 +9747,69 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8898,9 +9818,9 @@ msgstr "" -#: ../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 "" @@ -8909,65 +9829,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8975,13 +9895,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9002,5 +9922,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9013,12 +9933,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 "Vali kõik." - -#: ../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 "" @@ -9049,6 +9968,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9057,21 +9976,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" @@ -9080,37 +9999,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 "" -#: ../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." @@ -9122,18 +10052,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9141,5 +10071,5 @@ msgstr "" -#: ../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). " @@ -9147,39 +10077,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9235,12 +10165,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Ühendun OSM serveriga" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "Primitiiv on juba kustutatud" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9274,20 +10202,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" @@ -9295,9 +10223,14 @@ 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 +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" @@ -9305,30 +10238,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "Kleebi" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "Märkus" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Null koordinaadid: " +msgid "Set " +msgstr "Vali" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9390,6 +10332,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)" @@ -9411,6 +10353,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 "" @@ -9426,7 +10368,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Kihid: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -9946,6 +10888,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 "" @@ -9957,8 +10899,4 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 msgid "land" -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" msgstr "" @@ -10242,9 +11180,9 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10253,5 +11191,5 @@ msgstr "" -#: ../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 "" @@ -10810,5 +11748,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 "" @@ -10827,29 +11765,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 "" @@ -10863,23 +11801,15 @@ msgstr "Ühendab üksteist katvad alad" -#: ../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 "Praegu saab ühendada ainult kuni kaks ala." -#: ../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 "" -#: ../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" @@ -10888,38 +11818,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10927,81 +11857,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Lihtsusta tee" -#: ../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 "Palun vali lihtsustamiseks vähemalt üks tee." -#: ../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?" @@ -11013,25 +11943,25 @@ "Valik sisaldab {0} teed. Kas oled kindel, et soovid neid lihtsustada?" -#: ../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 "" @@ -11118,53 +12048,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" @@ -11189,20 +12119,49 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +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 +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 "Kahekordista" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 "Kustuta sõlmi või teid" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11285,23 +12244,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11310,7 +12269,7 @@ msgstr "" +#: ../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 "" @@ -11318,80 +12277,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11399,82 +12358,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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:711 +msgid "Check property values." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "" -#: ../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}''" @@ -11619,7 +12578,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 "" @@ -11633,5 +12592,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 "" @@ -11767,5 +12726,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11810,14 +12769,14 @@ msgstr "" -#: ../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}" @@ -11828,26 +12787,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 "" -#: ../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 "" -#: ../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 " @@ -11855,37 +12814,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -11898,104 +12875,142 @@ 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 "kasutusest väljas" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 +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" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "WMS URL (Default)" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../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 "Suurenda valitud elementidele" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Palun vali vähemalt üks tee." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12356,61 +13371,6 @@ #: 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 "" @@ -12426,5 +13386,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 "Rajad" @@ -12439,5 +13399,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" @@ -12447,10 +13406,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 "" @@ -12494,9 +13453,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 "Ühesuunaline" @@ -12544,13 +13503,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 "Sild" @@ -12592,13 +13551,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 "Tunnel" @@ -12638,12 +13597,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 "" @@ -12683,12 +13642,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 "" @@ -12844,17 +13803,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 "" @@ -12881,4 +13840,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" @@ -12897,11 +13857,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 "" @@ -12911,4 +13872,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" @@ -12923,9 +13885,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 "" @@ -12933,10 +13896,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 "tervishoid" + +#: 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 "Kaubandus" + +#. 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 "mets" + +#: 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 "parkimis_pilet" #. item "Ways/Track Grade 2" combo "Surface" @@ -12944,11 +13970,91 @@ #: 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 "valik" + +#: 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 +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 +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 "" @@ -13030,20 +14136,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 "" @@ -13056,8 +14162,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 "" @@ -13092,32 +14198,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 "" @@ -13130,40 +14251,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 "" @@ -13176,19 +14297,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 "" @@ -13211,65 +14332,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13284,10 +14410,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 "" @@ -13303,17 +14429,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" @@ -13325,30 +14450,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 "" @@ -13356,25 +14481,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 "" @@ -13385,5 +14510,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 "" @@ -13399,5 +14524,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" #. @@ -13405,9 +14530,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 "" @@ -13427,10 +14552,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 "" @@ -13452,10 +14577,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 "" @@ -13477,10 +14602,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 "" @@ -13502,5 +14627,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" @@ -13515,9 +14640,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 "" @@ -13531,9 +14656,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 "" @@ -13563,10 +14688,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 "" @@ -13596,6 +14721,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 "" @@ -13606,10 +14731,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 "" @@ -13617,19 +14742,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Teed" #. 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 "" @@ -13645,5 +14770,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "" @@ -13652,5 +14777,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13658,5 +14783,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13664,5 +14789,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Jalgrattatee" @@ -13672,11 +14797,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 "presbüterlane" #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Jalgtee" @@ -13685,11 +14816,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 "Pagar" #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "" @@ -13698,5 +14835,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "" @@ -13704,5 +14841,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "" @@ -13712,5 +14849,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 "" @@ -13719,5 +14856,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13726,39 +14863,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 "" @@ -13767,5 +14876,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13773,5 +14882,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13780,5 +14889,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13786,5 +14895,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13793,5 +14902,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13799,5 +14908,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13806,5 +14915,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13812,5 +14921,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13819,5 +14928,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13826,5 +14935,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "" @@ -13833,19 +14942,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 "Matkamine" @@ -13855,5 +14967,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 "" @@ -13861,5 +14973,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -13869,5 +14981,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 "" @@ -13875,5 +14987,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -13883,5 +14995,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 "" @@ -13889,5 +15001,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -13897,5 +15009,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 "" @@ -13903,5 +15015,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -13911,5 +15023,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 "" @@ -13917,5 +15029,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -13925,5 +15037,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 "" @@ -13931,10 +15043,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 "" @@ -13942,15 +15054,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 "" @@ -13958,5 +15070,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -13970,4 +15082,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" #. @@ -13987,18 +15101,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 "Operaatorfirma" @@ -14007,5 +15123,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "" @@ -14015,5 +15131,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -14022,27 +15138,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 "" @@ -14050,6 +15166,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 "" @@ -14058,11 +15174,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 "" @@ -14070,30 +15186,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 "" @@ -14101,5 +15217,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14108,14 +15224,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14126,14 +15242,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 "" @@ -14143,20 +15259,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 "Linnapiiri märk" #. 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 "" @@ -14164,5 +15280,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "" @@ -14170,5 +15286,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14176,5 +15292,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14183,10 +15299,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 "" @@ -14194,5 +15310,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14200,5 +15316,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14206,11 +15322,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 "" @@ -14218,5 +15334,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "" @@ -14224,5 +15340,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14230,5 +15346,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14273,16 +15389,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 "" @@ -14291,5 +15407,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14297,5 +15413,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14303,10 +15419,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 "" @@ -14314,15 +15430,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 "" @@ -14330,5 +15446,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "" @@ -14336,10 +15452,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 "" @@ -14349,5 +15465,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14356,5 +15472,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14363,5 +15479,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "" @@ -14369,5 +15485,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "" @@ -14376,5 +15492,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14386,15 +15502,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 "" @@ -14402,50 +15518,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 "" @@ -14453,25 +15569,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 "" @@ -14482,10 +15598,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 "" @@ -14493,5 +15609,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "" @@ -14499,5 +15615,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14505,10 +15621,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 "" @@ -14516,10 +15632,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 "" @@ -14527,10 +15643,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 "" @@ -14540,5 +15656,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 "" @@ -14546,15 +15662,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 "" @@ -14562,15 +15678,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 "" @@ -14578,15 +15694,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 "" @@ -14594,5 +15710,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "" @@ -14601,10 +15717,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 "" @@ -14615,14 +15731,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 "" @@ -14636,35 +15752,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 "" @@ -14672,20 +15788,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 "" @@ -14693,10 +15809,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 "" @@ -14704,5 +15820,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "" @@ -14710,5 +15826,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "" @@ -14716,5 +15832,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14723,5 +15839,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14729,10 +15845,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 "" @@ -14740,5 +15856,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14746,5 +15862,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "" @@ -14752,15 +15868,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 "" @@ -14769,5 +15885,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14775,20 +15891,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 "" @@ -14797,15 +15913,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 "" @@ -14813,10 +15929,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 "" @@ -14824,10 +15940,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 "" @@ -14837,5 +15953,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 "" @@ -14843,10 +15959,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 "" @@ -14854,5 +15970,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -14882,8 +15998,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 "" @@ -14897,35 +16013,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 "" @@ -14933,45 +16049,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 "" @@ -14979,5 +16095,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -14986,14 +16102,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 "" @@ -15002,5 +16118,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15009,5 +16125,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15017,5 +16133,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15023,5 +16139,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15030,10 +16146,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 "" @@ -15041,10 +16157,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 "" @@ -15052,10 +16168,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 "" @@ -15063,10 +16179,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 "" @@ -15074,5 +16190,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15080,5 +16196,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 "" @@ -15089,10 +16205,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 "" @@ -15102,9 +16218,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 "Avatud" + +#. 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" @@ -15124,47 +16469,73 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" +#. 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:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 +#: build/trans_presets.java:1393 +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 +msgid "Capacity (overall)" +msgstr "" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 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 +#: build/trans_presets.java:1398 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "" @@ -15172,5 +16543,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "Pood" @@ -15178,15 +16549,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "" @@ -15194,5 +16565,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "" @@ -15201,10 +16572,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "" @@ -15212,5 +16583,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "" @@ -15218,6 +16589,11 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" +msgstr "" + +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" msgstr "" @@ -15225,5 +16601,5 @@ #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "" @@ -15232,15 +16608,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 "Avalik transport" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -15248,5 +16624,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15254,5 +16630,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15260,5 +16636,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -15267,5 +16643,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -15273,5 +16649,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -15280,5 +16656,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -15290,5 +16666,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 "" @@ -15296,10 +16672,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 "" @@ -15308,10 +16684,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 "" @@ -15320,5 +16696,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "" @@ -15327,5 +16703,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "" @@ -15333,5 +16709,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -15341,5 +16717,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 "" @@ -15348,8 +16724,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 "" @@ -15357,10 +16731,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 "" @@ -15368,5 +16742,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "" @@ -15374,5 +16748,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "" @@ -15380,5 +16754,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "" @@ -15386,15 +16760,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 "" @@ -15403,5 +16777,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Majutus" @@ -15413,5 +16787,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -15420,15 +16794,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 "" @@ -15436,20 +16810,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 "" @@ -15457,10 +16831,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 "" @@ -15468,30 +16842,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 "" @@ -15499,10 +16873,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 "Toit ja jook" @@ -15513,5 +16887,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restoran" @@ -15519,5 +16893,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "" @@ -15525,5 +16899,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 "" @@ -15531,61 +16905,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 "kohalik" -#: 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 "Kiirtoit" @@ -15593,9 +16967,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 "Kohvik" @@ -15603,10 +16977,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 "Pubi" @@ -15614,20 +16987,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 "Baar" @@ -15635,10 +17006,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 "Ööklubi" @@ -15646,33 +17016,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 "Turism" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Vaatamisväärsus" #. 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 "Avatud" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Muuseum" @@ -15680,10 +17041,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 "Loomaaed" @@ -15692,10 +17052,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 "" @@ -15703,25 +17062,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 "Teemapark" #. 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 "" @@ -15729,5 +17087,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "" @@ -15735,86 +17093,208 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Infopunkt" -#. 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 "Kaart" #. 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 "kuni" + +#. 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 "tänav" + +#: build/trans_presets.java:1720 +msgid "scheme" +msgstr "" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Allalaetav ala" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Kleebi" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Linn" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "kohalik" #. 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 "Purskaev" + +#. 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 "Suusatamine" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "Ehirus" + +#. 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 "Vali kontinent" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "murdmaa" + +#: 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 +msgid "plants" +msgstr "" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Info" + +#. 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 "sümboolne kirjeldus" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Heli" + +#. +#: 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 "Telefoninumber" + +#. 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 "" @@ -15822,25 +17302,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 "Lõkkease" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Piknikuplats" #. 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 "Ajaloolised kohad" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Loss" @@ -15849,20 +17329,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 "Varemed" #. 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 "" @@ -15871,10 +17350,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 "" @@ -15882,5 +17360,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "" @@ -15888,15 +17366,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. 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 "Mälestusmärk" @@ -15904,45 +17382,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 "Puhkus" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Veepark" #. 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 "Mänguväljak" @@ -15950,15 +17428,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 "Kalapüük" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "" @@ -15966,15 +17444,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 "Staadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "" @@ -15988,6 +17466,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 "vali spordiala:" @@ -16379,30 +17857,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 "" @@ -16412,227 +17890,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 "kanuu" -#: 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 "ameerika_jalgpall" -#: 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 "golf" -#: 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 "suusatamine" -#: 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 "jalgpall" -#: 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 "lauatennis" -#: 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 "tennis" -#: 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 "Golfiväljak" #. 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 "" @@ -16671,248 +18147,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "Ujumine" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Suusatamine" - #. 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 "mägi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "murdmaa" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "lumepark" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Raskusaste" #. 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 "kerge" -#: 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 "ekspert" -#: 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 "Lasketiir" @@ -16920,178 +18388,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 "Jalgpall" #. 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 "Pesapall" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Vali pesapall" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Korvpall" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Vali korvpall" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. 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 "Golfiväljak" -#: 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 "Kriket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Vali kriket" -#: 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 "Ragbi" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Vali ragbi" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Laua tennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Vali laua tennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Vali tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Ehitised" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Ehirus" @@ -17099,5 +18567,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Avalik hoone" @@ -17105,10 +18573,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 "Raekoda" @@ -17116,10 +18584,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Vali raekoda" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Saatkond" @@ -17127,10 +18595,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Vali saatkond" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Kohtumaja" @@ -17139,10 +18607,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Vali kohtumaja" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Vangla" @@ -17151,10 +18619,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Vali vangla" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Politsei" @@ -17164,10 +18632,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 "Vali politsei" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Tuletõrjedepoo" @@ -17176,10 +18644,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Vali tuletõrjedepoo" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postkontor" @@ -17187,5 +18655,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "" @@ -17193,15 +18661,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Lasteaed" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Vali lasteaed" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Kool" @@ -17209,10 +18677,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Vali kool" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Ülikool" @@ -17220,10 +18688,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Vali ülikool" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Kolledž" @@ -17231,5 +18699,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Vali kolledž" @@ -17237,5 +18705,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kino" @@ -17244,10 +18712,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Vali kino" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Raamatukogu" @@ -17256,10 +18724,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Vali raamatukogu" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "" @@ -17267,10 +18734,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 "Teater" @@ -17279,10 +18746,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Vali teater" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Palvekoht" @@ -17292,5 +18759,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 "Vali palvekoht" @@ -17299,6 +18766,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 "Religioon" @@ -17307,66 +18774,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 "budist" -#: 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 "kristlane" -#: 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 "hindu" -#: 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 "juudi" -#: 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 "moslem" -#: 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 "sikh" -#: 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 "spiritualist" -#: 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 "taoist" -#: 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 "zoroastrism (pärsia)" -#: 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 "Usutunnistus" @@ -17375,81 +18842,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 "anglikaan" -#: 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 "baptist" -#: 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 "katoliku" -#: 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 "evangeelne" -#: 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 "jehoovatunnistajad" -#: 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 "luterlane" -#: 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 "metodist" -#: 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 "mormoon" -#: 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 "ortodoksne" -#: 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 "nelipühalane" -#: 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 "presbüterlane" -#: 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 "protestantlik" -#: 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 "kveeker" -#: 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 "šiia" -#: 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 "Aadressid" @@ -17458,5 +18925,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Vali aadressi infot" @@ -17464,5 +18931,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Maja number" @@ -17470,20 +18937,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Maja nimi" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Linna nimi" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Posti kood" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Riigi kood" @@ -17491,5 +18958,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "" @@ -17498,5 +18965,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "" @@ -17504,71 +18971,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 "paaritu" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "paaris" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "kõik" - -#: 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 "Inimtekkeline" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Töökojad" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Vali töökojad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Torn" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Vali torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Veetorn" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Vali veetorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gaasimahuti" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Vali gaasimahuti" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Majakas" @@ -17576,10 +19039,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Vali majakas" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Tuuleveski" @@ -17587,10 +19050,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Vali tuuleveski" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Torustik" @@ -17598,10 +19061,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Vali torustik" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "" @@ -17611,10 +19074,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 "Kraana" @@ -17622,10 +19085,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Vali kraana" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Tuletorn" @@ -17633,10 +19096,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Vali tuletorn" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Geodeetiline punkt" @@ -17644,10 +19107,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Vali ülevaatlus punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "järelvalve" @@ -17655,5 +19118,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Vali järelvalve kaamera" @@ -17661,5 +19124,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Elektri generaator" @@ -17669,39 +19132,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 "Vali elektri generaator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "tuul" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hüdro" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fosiil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "tuuma" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "süsi" -#: 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 "gaas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Elektrijaam" @@ -17710,10 +19173,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Vali elektrijaam" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Elektrialajaam" @@ -17722,5 +19185,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Vali elektri alajaam" @@ -17728,10 +19191,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 "" @@ -17742,5 +19205,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 "" @@ -17748,5 +19211,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "" @@ -17755,46 +19218,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 "Pinge" #. 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 "Teenused" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Tualetid" -#. 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 "Märkus" #. 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 "Telefon" @@ -17803,5 +19260,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "" @@ -17809,5 +19266,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 "Mündid" @@ -17815,5 +19272,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 "Märkused" @@ -17821,5 +19278,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 "" @@ -17827,5 +19284,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 "Deebetkaart" @@ -17833,15 +19290,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 "Krediitkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefoni kaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Jäätmekäitlus" @@ -17850,5 +19307,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Muuda jäätmekäitlusjaam" @@ -17856,80 +19313,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Battareid" #. 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 "Riided" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Klaas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Paber" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Vanaraud" #. 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 "Jahikantsel" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Muuda jahiala" -#. 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 "Kõrgus" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "madal" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "pool" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "täis" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Peida" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Lukusta" -#. 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 "Kõrgus" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "madal" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "pool" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "täis" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Purskaev" @@ -17938,10 +19391,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Vali purskaev" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Joogi vesi" @@ -17950,10 +19403,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Vali joogivee asukoht" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -17961,25 +19414,34 @@ #. 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 "Poed" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Vali Supermarket" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +msgid "Chemist" +msgstr "" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Vali linn" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Nurgakauplus" @@ -17987,10 +19449,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Vali nurgakauplus" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -17998,10 +19459,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Vali kiosk" -#. 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 "Vali arstid" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Muuda puud" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "" @@ -18009,5 +19489,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "" @@ -18015,88 +19495,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 "ühistranspordi_piletid" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "ühistranspordi_plaanid" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parkimis_pilet" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "toit" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "joogid" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "maiustused" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "suitsud" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotod" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "looma_toit" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "ajalehed" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "mänguasjad" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "templid" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kaardid" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" -msgstr "" - -#: build/trans_presets.java:2417 +msgstr "telefoni_kaardid" + +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "kondoomid" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampoonid" -#: 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 "Lihunik" @@ -18104,10 +19584,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Vali lihunik" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Pagar" @@ -18115,10 +19594,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Vali pagar" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Lilleseadja" @@ -18126,81 +19604,73 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Vali lilleseadja" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Ökokaubad" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Redigeeri ökopoodi" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" -msgstr "" +msgstr "Alkohol" #. 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 +msgstr "Redigeeri alkoholi poode" + +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Joogipood" #. 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 "Arvuti" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Vali arvutipood" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektroonika" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Vali elektroonika pood" -#. 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 "Mööbel" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Vali mööblipood" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Aiakeskus" @@ -18208,10 +19678,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Vali aiakeskus" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Riistvara" @@ -18219,10 +19688,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Vali riistvara pood" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "" @@ -18230,60 +19698,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 "Kirjatarbed" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Vali kirjatarvete pood" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Juuksur" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Vali juuksur" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Jalatsid" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Vali jalatsi pood" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Mänguasjad" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Vali mänguasja pood" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Vali video pood" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Kuiir puhastus" @@ -18291,10 +19753,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Vali kiirpuhastus" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Pesumaja" @@ -18302,10 +19763,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Vali pesumaja" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Välisuks" @@ -18313,35 +19773,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Vali välisukse pood" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sport" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Vali spordi pood" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optik" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Vali optika" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Sularaha" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Pank" @@ -18349,16 +19806,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Vali Pank" -#. 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 "Sularaha automaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Raha vahetus" @@ -18366,5 +19821,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Vali rahavahetus punkt" @@ -18372,15 +19827,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Vali sularaha automaat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Tervis" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Arstid" @@ -18388,20 +19843,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Vali arstid" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Hambaarst" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Vali hambaarst" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apteek" @@ -18409,5 +19862,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Vali Apteek" @@ -18415,10 +19868,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Retseptuur" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Haigla" @@ -18426,10 +19878,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Vali haigla" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Hädaabi tugijaam" @@ -18438,5 +19890,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Vali hädaabi tugijaam" @@ -18445,20 +19897,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Punkti number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Punkti nimi" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Telefoninumber" #. 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 "" @@ -18466,5 +19918,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 "Loomaarst" @@ -18473,55 +19925,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Vali loomaarst" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Vali kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Maa" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Vali maa" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Riik" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Vali riik" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Regioon" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Vali regioon" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Maakond" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Vali maakond" @@ -18529,15 +19981,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Linn" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Vali linn" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Linn" @@ -18545,10 +19997,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Muuda linna" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Linnaosa" @@ -18556,25 +20008,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Muuda linnaosa" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Küla/Alevik/Alev" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Muuda küla/alevik/alev" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Küla" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Muuda küla" @@ -18582,5 +20034,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Asustamata koht" @@ -18588,10 +20040,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Muuda asustamata kohta" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Saar" @@ -18599,11 +20051,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Muuda saart" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "Vasakule" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Muuda küla" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Koobas" @@ -18611,10 +20076,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Muuda koobast" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Mäetipp" @@ -18622,10 +20087,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Muuda mäetippu" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Liustik" @@ -18633,10 +20098,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Muuda liustikku" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkaan" @@ -18644,70 +20109,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Muuda vulkaani" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Piirid" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Riiklikud" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Muuda riiklikke piire" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administratiivpiir" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Muuda administratiivpiire" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Omavalitsus" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Muuda omavalitsuse piire" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Valimisringkond" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Muuda valimisringkonda" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Rahvuspark" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Muuda rahvuspargi piire" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Maakasutus" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Üksik puu" @@ -18716,15 +20181,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Muuda puud" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botaaniline nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Mets" @@ -18733,5 +20198,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Muuda metsa" @@ -18739,17 +20204,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 "okasmets" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "lehtmets" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "segamets" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Kultuurmets" @@ -18758,14 +20223,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Muuda kultuurmetsa" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Looduskaitseala" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Muuda looduskaitseala" @@ -18773,25 +20238,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "klibu, rusukalle" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Muuda rusukallet" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Võsa" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Muuda võsa" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Langus" @@ -18799,10 +20264,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Muuda langust" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Nõmm" @@ -18810,5 +20275,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Muuda nõmme" @@ -18816,5 +20281,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Taluõu" @@ -18823,45 +20288,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Muuda taluõue" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Talumaa" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Muuda talumaad" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Niit/Karjamaa" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Muuta niitu" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Viinapuuistandus" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Muuda viinapuuistandust" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Eraldised" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Muuda eraldisi" @@ -18869,25 +20334,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Aed" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Muuda aeda" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Muru" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Muuda muru" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Külatanum" @@ -18895,10 +20360,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Muuda külatanumat" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Avalik maa" @@ -18906,20 +20371,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Muuda avalikku maad" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Muuda parki" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Puhkeala" @@ -18927,5 +20392,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Muuda puhkeala" @@ -18933,15 +20398,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Elamurajoon" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Muuda elamurajooni" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Matmispaik" @@ -18949,9 +20414,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Muuda matmispaika" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Kalmistu" @@ -18959,39 +20424,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Muuda kalmistut" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Kaubandus" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Muuda kaubandust" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Kommerts" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Muuda kommertspiirkonda" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Tööstus" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Muuda tööstuspiirkonda" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Raudtee" @@ -18999,15 +20464,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Muuda raudteed" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militaarala" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Muuda militaarala" @@ -19015,55 +20480,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Ehitustanner" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Muuda ehitustandrit" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Jäätmaa" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Muuda jäätmaad" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Roheala" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Muuda roheala" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Prügimägi" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Muuda prügimäge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Kivimurd" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Muuda kivimurdu" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Hulknurk" @@ -19073,5 +20538,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 "Muuda hulknurka" @@ -19080,10 +20545,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "väline osa" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "siseosa" @@ -19091,5 +20556,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Pöördekeelud" @@ -19098,5 +20563,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Muuda pöördekeelde" @@ -19104,34 +20569,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Keelud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "vasakpöörde keeld" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "parempöörde keeld" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "ei tohi otse sõita" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "ei tohi tagasi pöörata" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "ainult parempööre" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "ainult vaskpööre" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "ainult otsesõit" @@ -19140,15 +20605,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "teelt" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "üle sõlme või tee" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "teele" @@ -19156,5 +20621,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Teekond" @@ -19163,5 +20628,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Muuda teekonda" @@ -19169,5 +20634,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "teekonna tüüp" @@ -19239,5 +20704,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 @@ -19246,17 +20711,17 @@ msgstr "jalgrattaga" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "tee" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "praam" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "suusad" @@ -19309,5 +20774,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 @@ -19316,13 +20781,13 @@ msgstr "jalgsi" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "matkamine" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tramm" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "ümbersõit" @@ -19336,10 +20801,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metroo" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "sümboolne kirjeldus" @@ -19347,31 +20812,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Võrk" #. 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 "planeeritud" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "täiendav" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "ajutine" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "ühendus" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Värv (hex)" @@ -19380,30 +20845,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "teekonna osa" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "edasisuunaline osa" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "tagasisuunaline osa" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "peatuspunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "edasisuunaline peatuspunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "tagasisuunaline peatuspunkt" @@ -19841,11 +21306,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 "kasutusest väljas" @@ -20171,41 +21636,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 "tänav" #. color street @@ -21906,5 +23334,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 "vesi" @@ -22503,55 +23931,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22565,5 +23944,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 "turism" @@ -22635,8 +24014,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 "alalooline" @@ -22707,8 +24086,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 "roheala" @@ -22722,5 +24101,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "kivimurd" @@ -22734,5 +24113,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "prügimägi" @@ -22754,5 +24133,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "tehisjärv" @@ -22766,5 +24145,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "kultuurmets" @@ -22778,5 +24157,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "taluõu" @@ -22799,5 +24178,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "kaubandus" @@ -22811,5 +24190,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "tööstus" @@ -22823,5 +24202,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "jäätmaa" @@ -22835,5 +24214,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "rohepiirkond" @@ -22847,5 +24226,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "raudteede piirkond" @@ -22902,7 +24281,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 "militaarala" @@ -22916,5 +24295,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "kalmistu" @@ -22927,5 +24306,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "mäetipp" @@ -22940,5 +24319,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "liustik" @@ -22952,5 +24331,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulkaan" @@ -23005,8 +24384,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 "looduslik" @@ -23020,5 +24399,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "põõsastik" @@ -23032,20 +24411,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "nõmm" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "mets" - #. color water #. 1 @@ -23056,5 +24423,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "muda" @@ -23068,5 +24435,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "rand" @@ -23144,8 +24511,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 "teekond" @@ -23193,7 +24560,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 "piir" @@ -23335,10 +24702,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 "koht" @@ -23386,6 +24762,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 "aadress" @@ -23682,4 +25058,29 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun " +#~ "teata sellest veast arendajaid." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Kustuta {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autorid: {0}" + #~ msgid "Move" #~ msgstr "Liiguta" @@ -23687,7 +25088,4 @@ #~ msgid "Data Layer" #~ msgstr "Andmekiht" - -#~ msgid "Not implemented yet." -#~ msgstr "Pole veel teostatud." #~ msgid "Unknown file extension." Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 17484) +++ /applications/editors/josm/i18n/po/fi.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-15 13:38+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-30 22:10+0000\n" +"Last-Translator: Krisu \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Luodaan pääikkuna" #. 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 "Ohje" -#: ../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 "" - -#: ../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 +msgstr "Projektiota {0} ei voitu aktivoida. Käytetään Mercatoria" + +#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Virhe" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle." - -#: ../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] "Tallentamattomia muutoksia. Hylätäänkö muutokset?" +msgstr[1] "Tallentamattomia muutoksia. Hylätäänkö muutokset?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Tallentamattomia muutoksia" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?" - -#: ../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 "Tallenna ja poistu" -#: ../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 "Poistu tallentamatta" -#: ../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 "Peruuta" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{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 "Varoitus" -#: ../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 "Jätetään huomioimatta virheellinen URL-osoite: ”{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Liitännäiset" @@ -344,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -359,19 +376,19 @@ msgstr "" -#: ../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 "" +msgstr "Ole hyvä ja valitse kohdetaso" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +msgstr "Valitse kohdetaso" + +#: ../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 +msgstr "Yhdistä" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -380,7 +397,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" -msgstr "" +msgstr "Ei kohdetasoja" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -395,11 +412,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 @@ -428,5 +445,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 "Leveysaste" @@ -435,30 +452,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 "Pituusaste" +#: ../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 "Siirrä pisteet ympyrän kehälle" -#: ../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 "Siirtää valitut pisteet ympyrän kehälle." -#: ../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 @@ -472,6 +489,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 @@ -479,58 +496,57 @@ msgstr "Työkalu: {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 "Valitse ainakin neljä pistettä." #. 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 "Tiedot" #. 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 "Kohdista pisteet samalle viivalle" -#: ../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 "Siirtää valitut pisteet samalle viivalle." -#: ../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 "Valitse ainakin kolme pistettä." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -538,11 +554,13 @@ "{0}, max is {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 +"Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on {0}, " +"enimmäismäärä on {1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -551,5 +569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -558,46 +576,46 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "taso" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "valinta" -#: ../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 "ristiriita" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "lataa" +#: ../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 "Sovita näkymä {0}:aan." -#: ../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 "Sovita {0} näkymään." -#: ../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 @@ -607,22 +625,22 @@ msgstr "Näytä: {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 "Ei mitään valittuna" -#: ../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 "Ei ristiriitoja" +#: ../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 "Yhdistä polkuja" -#: ../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 "Yhdistää monta polkua yhdeksi." -#: ../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 "Valitse ainakin kaksi yhdistettävää polkua." @@ -633,4 +651,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Yhdistä silti" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -640,18 +662,7 @@ "ne?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Yhdistä silti" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Vaihdetaanko suuntia?" - -#: ../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 "" -"Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -659,27 +670,33 @@ msgstr "Käännä ja yhdistä" -#: ../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 "" +"Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" + +#: ../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 "Syötä arvot kaikille ristiriidoille." -#: ../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 "Ratkaise ristiriitoja" -#: ../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 "Yhdistä {0} polkua" -#: ../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 "Kaikki polut olivat tyhjiä" -#: ../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 " @@ -688,32 +705,32 @@ "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" +#: ../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 "Kopioi" -#: ../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 "Kopioi valitut objektit leikepöydälle." -#: ../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 "Valitse jotain kopioitavaksi." +#: ../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 "Luo ympyrä" -#: ../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 "Luo ympyrän kolmesta valitusta pisteestä." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -724,20 +741,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 "Poista" @@ -747,85 +764,86 @@ msgstr "Poista valitut objektit." -#: ../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 "Korvaa" -#: ../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 "Tiedosto on jo olemassa. Korvataanko?" #. 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 "Kohdista pisteet tasavälein viivalle" -#: ../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 "Jakaa valitut pisteet tasaisin välein viivalle." +#: ../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 "Lataa OSM:sta..." -#: ../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 "Lataa karttadataa OSM-palvelimelta." -#: ../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 "Tiedosto: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Lataa" -#: ../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 "Valitse vähintään yksi ladattava tietolaji." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +msgstr "Tuonnin aikana oli {0} konfliktia." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +msgstr "Konflikti latauksen aikana" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -834,6 +852,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 "Monista" @@ -857,85 +875,91 @@ msgstr "Poistu ohjelmasta." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Kaikki kuvat" + +#: ../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-vienti..." -#: ../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 "Vie data GPX-tiedostoon." -#: ../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 "Ei mitään vietävää. Hae ensin dataa." -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58 +msgstr "parametri ''{0}'' ei saa olla tyhjä" + +#: ../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 "" -#: ../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 "Vie GPX-tiedosto" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM-verkko-ohje" -#: ../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 "Avaa selaimessa" -#: ../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 "Muokkaa" -#: ../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 "Lataa uudelleen" -#: ../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 "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta" -#: ../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 "Virhe ladattaessa sivua {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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -956,5 +980,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Tietoa elementistä" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -981,28 +1005,32 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "Liitä taso" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - +msgstr "Liitä nykyinen taso toiseen tasoon" + +#: ../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 "Yhdistä pisteet" -#: ../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 "Yhdistää pisteet vanhimpaan." -#: ../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 "Valitse vähintään kaksi yhdistettävää pistettä." -#: ../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 "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Yhdistä silti" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1012,77 +1040,73 @@ "ne?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Yhdistä silti" - -#: ../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 "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." -#: ../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 "Yhdistä {0} pistettä" +#: ../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 "Liitä valinta" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Peilaa" -#: ../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 "Peilaa valitut pisteet ja polut" -#: ../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 "Valitse ainakin yksi solmu tai tie" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "ylös" -#: ../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 "Siirrä objektit {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "alas" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "vasen" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "oikea" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Siirrä {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 "Siirtää objektit {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 "Objekteja ei voi siirtää maailman ulkopuolelle" @@ -1090,5 +1114,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 "Uusi" @@ -1098,17 +1122,22 @@ msgstr "Luo uusi kartta." -#: ../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 "Avaa..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Avaa tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Avaa tiedosto" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Tuntematon rooli \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1146,22 +1175,18 @@ msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Vain kaksi pistettä sallittu" -#: ../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 "Valinnan pitää muodostua pelkistä poluista." -#: ../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 "" "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma." - -#: ../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 " @@ -1170,9 +1195,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 "Vain yksi piste valittuna" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Suorakulmaista" @@ -1188,13 +1213,26 @@ msgstr "Liitä leikepöydän sisältö" -#: ../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 "Liitä tagit" -#: ../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 "Liitä valituille kohteille avain/arvo-parit leikepöydältä." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Ladataan {0}" +msgstr[1] "Ladataan {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1220,37 +1258,32 @@ msgstr "Toista edellinen kumottu toiminto" -#: ../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 "Nimeä taso uudelleen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Nimeä myös tiedosto uudelleen" -#: ../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 "" - +msgstr "Ei voitu nimetä uudelleen tiedostoa ''{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 "Käännä polut" -#: ../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 "Kääntää valittujen polkujen suunnan." -#: ../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 "Valitse ainakin yksi polku." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Käännä polut" @@ -1258,10 +1291,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 "Tallenna" #: ../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 "Tallenna tämänhetkinen data." @@ -1272,37 +1306,25 @@ msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?" -#: ../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 "" -"Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia " -"tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Tyhjä dokumentti" -#: ../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 "Dokumentti ei sisällä tietoa" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Tallenna silti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Ristiriidat" -#: ../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 " @@ -1312,28 +1334,28 @@ "ristiriidoista. Jatka tallennusta?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Hylkää ristiriidat ja tallenna" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Tallenna OSM-tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Tallenna GPX-tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Tallenna kerros" +#: ../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 "Tallenna nimellä..." -#: ../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 "Tallenna data uuteen tiedostoon." @@ -1366,33 +1388,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Raportti" -#: ../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 "Kopioi leikepöydälle ja sulje" -#: ../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 "Sulje" +#: ../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 "Katkaise polku" -#: ../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 "Katkaisee polun valitun pisteen kohdalta." -#: ../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 "Valintaa ei voida käyttää jakamiseen." -#: ../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." @@ -1400,5 +1422,5 @@ msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua." -#: ../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 " @@ -1414,9 +1436,9 @@ "valitse myös polku jonka haluat katkaista." -#: ../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 "Valitut pisteet eivät ole samalla polulla." -#: ../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." @@ -1424,10 +1446,10 @@ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä." -#: ../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 "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi." -#: ../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 " @@ -1437,5 +1459,5 @@ "pisteitä, jotka eivät ole polun päissä.)" -#: ../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 " @@ -1443,5 +1465,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 " @@ -1449,8 +1471,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 "Katkaise polku {0} {1} osaksi" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Suljetaan muutoskokoelma..." + +#: ../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 "Suljetaan muutoskokoelma..." + +#: ../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 "Luodaan muutoskokoelma..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Suljetaan muutoskokoelma..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1468,47 +1515,47 @@ msgstr "Vaihda asetuksen \"{0}\" tila" +#: ../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 "Erota polut" -#: ../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 "Monistaa pisteet, jotka ovat monen polun käytössä." -#: ../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 "Tämä piste ei ole yhdistettynä mihinkään muuhun." -#: ../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 "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa." -#: ../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 "Mikään valitun polun pisteistä ei ole osana muita polkuja." -#: ../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 "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Valitse joko:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Yksi piste jolla on tageja, tai" -#: ../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 "* Yksi piste, joka on useamman polun käytössä, tai" +#: ../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 "" +"* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" + #: ../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 "" -"* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" - -#: ../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" @@ -1517,5 +1564,5 @@ "polkujen käytössä, tai" -#: ../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." @@ -1524,5 +1571,5 @@ "käytössä." -#: ../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" @@ -1535,9 +1582,9 @@ "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Irroitettu piste" -#: ../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" @@ -1545,5 +1592,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" @@ -1587,62 +1634,72 @@ msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta." -#: ../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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "Lähetä OSM-palvelimelle..." -#: ../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 "Lähetä kaikki muutokset OSM-palvelimelle..." -#: ../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 "" +"Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Ei mitään lähetettävää. Hae ensin dataa." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "" -"Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Ei lähetettäviä muutoksia." -#: ../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 "" -#: ../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 "" @@ -1656,17 +1713,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1677,32 +1734,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Lähetetäänkö nämä muutokset?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Lähetä muutokset" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Lisää uusi piste olemassa olevaan polkuun" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1710,31 +1805,79 @@ 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 "Anna lyhyt kuvaus lähetettävistä muutoksista:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Kartta-asetukset" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Lisättävät objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Muokattavat objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Poistettavat objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Lähetetäänkö nämä muutokset?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Lähetä muutokset" - -#: ../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] "Lisättävät objektit:" +msgstr[1] "Lisättävät objektit:" + +#: ../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] "Muokattavat objektit:" +msgstr[1] "Muokattavat objektit:" + +#: ../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] "Poistettavat objektit:" +msgstr[1] "Poistettavat objektit:" + +#: ../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 "Edellinen muutos {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1758,20 +1901,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 "Ääni: {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 "Nopeammin" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Nopeammin eteenpäin" @@ -1813,10 +1956,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 "Hitaammin" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Hitaammin eteenpäin" @@ -1844,31 +1987,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 "Dataa ei tuotu." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "OpenStreeMap-data" -#: ../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 "" -#: ../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 "" @@ -1880,20 +2019,20 @@ msgstr "" -#: ../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 "Poistotila" -#: ../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 "Poista pisteitä tai polkuja." -#: ../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 @@ -1902,5 +2041,5 @@ msgstr "Tila: {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 " @@ -1911,55 +2050,69 @@ "käyttävät polut." -#: ../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 "" +#: ../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 "Piirrä" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Piirrä pisteitä" -#: ../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 @@ -1967,38 +2120,38 @@ msgstr "valitut" -#: ../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 "Maailman ulkopuolelle ei voi lisätä pistettä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Lisää piste" -#: ../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 "Lisää piste polkuun" -#: ../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 "Yhdistä olemassa oleva polku pisteeseen" -#: ../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 "Lisää uusi piste olemassa olevaan polkuun" -#: ../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 "Lisää piste polkuun ja yhdistä" -#: ../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 "Luo uusi piste." -#: ../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 "Valitse kursorin alla oleva piste." -#: ../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." @@ -2007,14 +2160,14 @@ msgstr[1] "Lisää uusi piste {0} polkuun." -#: ../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 "Aloita uusi polku viimeisestä pisteestä." -#: ../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 "Jatka polkua viimeisestä pisteestä." -#: ../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 "Lopeta piirtäminen." @@ -2034,5 +2187,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 "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." @@ -2044,5 +2197,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 "Vapauta hiiren painike pyörityksen lopettamiseksi." @@ -2058,17 +2211,18 @@ msgstr "" +#: ../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 "Valitse" -#: ../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 "Valitse, siirrä ja pyöritä objekteja" -#: ../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" @@ -2077,13 +2231,21 @@ msgstr[1] "" -#: ../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 "Toteuta siirto" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Kumoa siirto" + +#: ../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 "" @@ -2091,18 +2253,14 @@ "Oletko varma että haluat siirtää ne?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Toteuta siirto" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Kumoa siirto" - -#: ../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." msgstr "" -#: ../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-" @@ -2127,60 +2285,60 @@ "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla." +#: ../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 "Etsi..." -#: ../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 "Etsi objekteja." -#: ../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 "Anna hakusana." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "korvaa valinta" -#: ../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 "lisää valintaan" -#: ../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 "poista valinnasta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "kirjainkoko merkitsee" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "säännöllinen lauseke" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2188,109 +2346,109 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" +msgid "modified - all changed objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Etsi" -#: ../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 "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../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 "Valintaan ei lisätty mitään haulla \"{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 "Valinnasta ei poistettu mitään haulla \"{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 "Löytyi {0} osumaa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2354,58 +2512,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Lataa valinta" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Ladataan..." -#: ../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 "Ei voitu lukea URL:stä: \"{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 "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Lisää piste" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relaatiot: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Muuta {0} objekti" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Edellinen muutos {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Muuta relaatiota" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" +msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format -msgid "Set {0}={1} for {2} ''{3}''" +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Aseta {0}={1} kohteelle {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 "Aseta {0}={1} kohteelle {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Aseta {0}={1} kohteelle {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" @@ -2414,10 +2610,10 @@ msgstr[1] "objektit" -#: ../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 "" -#: ../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}" @@ -2429,5 +2625,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2436,10 +2632,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2448,5 +2644,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}''" @@ -2470,44 +2666,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Poista {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Poista {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] "Poista {0} {1}" +msgstr[1] "Poista {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] "Poistotila" +msgstr[1] "Poistotila" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Poista {0} {1}" +msgstr[1] "Poista {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] "Poista relaatiosta" +msgstr[1] "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Ristiriidassa oleva relaatio" -#: ../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 "Poista relaatiosta" + +#: ../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 "" "Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n" "Poistetaanko relaatiosta?" -#: ../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 "Poista relaatiosta" - -#: ../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 "" "Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n" "Poistetaanko relaatiosta?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Katkaise polku" @@ -2515,6 +2727,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." @@ -2526,5 +2738,5 @@ "
Oletko varma, että haluat poistaa ne?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2535,5 +2747,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2568,10 +2780,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2584,18 +2806,38 @@ msgstr "Komentosarja" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Ratkaise {0} ristiriitaa {1} objektissa" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Ratkaise {0} ristiriitaa {1} objektissa" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Ratkaise {0} ristiriitaa {1} objektissa" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Ratkaise {0} ristiriitaa {1} objektissa" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Ratkaise {0} ristiriitaa {1} objektissa" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Ratkaise {0} ristiriitaa {1} objektissa" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2621,13 +2863,13 @@ "ominaisuuksiin ovat suositeltuja." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relaatio" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Vanha rooli" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Uusi rooli" @@ -2646,64 +2888,121 @@ #: ../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 "Uusi arvo" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Toteuta valtiut muutokset" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Älä toteuta muutoksia" -#: ../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 "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Ominaisuudet: " -#: ../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 "Automaattinen tagien korjaus" -#: ../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 "Konfiguraatiotiedostossa virhe riv(e)illä {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Omien asetusten hakemistoa {0} ei voi avata." - -#: ../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 "" "Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta " "tiedostosta tehdään varmuuskopio: {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 "Asetukset tallennettu kohteeseen {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 "Asetuksia ei voitu lähettää. Syy: {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 "Asetuksia ei voitu ladata palvelimelta." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2717,29 +3016,36 @@ msgstr "" -#: ../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 "Asteina desimaalilukuna" -#: ../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 "Asteina, minuutteina ja sekunteina" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "P" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "L" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "I" -#: ../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}" @@ -2751,15 +3057,230 @@ msgstr "" -#: ../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 "keskeneräinen" - -#: ../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 "Virhe: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Varoitus: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "Poistettu jäsen \"{0}\" relaatiossa." + +#: ../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 "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Löytyi enemmän kuin yksi \"from\" -polku" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Löytyi enemmän kuin yksi \"to\" -polku" + +#: ../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 "Useita \"via\" -jäseniä." + +#: ../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 "Tuntematon rooli \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Ei \"from\"-roolin tietä." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Ei \"to\"-roolin tietä." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa." + +#: ../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 "" +"\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." + +#: ../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 "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Kiellolle {0} ei löydy piirtotyyliä." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "ei tageja" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "teksti" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "epäaktiivinen" + #: ../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" @@ -2768,22 +3289,7 @@ msgstr[1] "pistettä" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Virhe: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Varoitus: {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" @@ -2792,12 +3298,7 @@ msgstr[1] "polkua" -#: ../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" @@ -2806,247 +3307,4 @@ msgstr[1] "relaatiot" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} jäsen" -msgstr[1] "{0} jäsentä" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "tie" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "rata" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vesiväylä" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "maankäyttö" - -#: ../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} piste" -msgstr[1] "{0} pistettä" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "Poistettu jäsen \"{0}\" relaatiossa." - -#: ../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 "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Löytyi enemmän kuin yksi \"from\" -polku" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Löytyi enemmän kuin yksi \"to\" -polku" - -#: ../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 "Useita \"via\" -jäseniä." - -#: ../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 "Tuntematon rooli \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Ei \"from\"-roolin tietä." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Ei \"to\"-roolin tietä." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa." - -#: ../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 "" -"\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." - -#: ../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 "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Kiellolle {0} ei löydy piirtotyyliä." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "ei tageja" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "teksti" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "epäaktiivinen" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3059,5 +3317,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "tausta" @@ -3067,5 +3325,5 @@ msgstr "korostus" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3075,5 +3333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3084,21 +3342,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3119,8 +3377,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3128,15 +3386,101 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Älä näytä uudelleen" -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "keskeneräinen" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "tie" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "rata" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vesiväylä" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "maankäyttö" + +#: ../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} piste" +msgstr[1] "{0} pistettä" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} jäsen" +msgstr[1] "{0} jäsentä" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "tuntematon" + +#: ../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 "" @@ -3146,36 +3490,9 @@ msgstr "" -#: ../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 "tuntematon" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3185,9 +3502,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 "" @@ -3196,9 +3513,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3207,9 +3524,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 "" @@ -3219,9 +3547,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Tuntematon palvelin" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3231,11 +3559,6 @@ msgstr "" -#: ../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 "" @@ -3253,38 +3576,38 @@ msgstr "Ladataan \"Päivän viestiä\"" -#: ../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 "Lähetä asetukset" -#: ../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 "Lähetä nykyiset asetukset palvelimelle" -#: ../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 "merkkijono" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Käyttäjän nimi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM:n salasana." -#: ../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 "Muuta sovelman koko annetuksi (muoto: LEVEYSxKORKEUS)" -#: ../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 "merkkijono;merkkijono;..." -#: ../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 " @@ -3292,5 +3615,5 @@ msgstr "" -#: ../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 " @@ -3298,5 +3621,5 @@ msgstr "" -#: ../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 " @@ -3304,75 +3627,94 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "mikä tahansa" -#: ../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 "Jos määritetty, nollaa asetukset niiden lukemisen sijaan." -#: ../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 "Käyttäjänimi" -#: ../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 "Salasana" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "käyttö" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "valinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Näytä tämä ohje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "" -#: ../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 "" -#: ../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 "Avaa tiedosto (gps-datana, jos *.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 "" -#: ../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 "Palauta oletusasetukset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Aseta kieli." -#: ../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 "esimerkkejä" -#: ../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" @@ -3380,47 +3722,47 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Aktivoidaan päivitetyt liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Ladataan aikaisia liitännäisiä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Asetetaan oletuksia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Ladataan liitännäiset" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Tiedosto" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Työkalut" -#: ../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 "Esivalinnat" -#: ../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 @@ -3432,21 +3774,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 "Rautalankanäkymä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Vaihda rautalankanäkymän päälläoloa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Koko näyttö -tila" -#: ../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 "Ääni" @@ -3486,58 +3828,44 @@ msgstr "Loitonna" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "skaalaus" -#: ../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 "Pituusaste osoittimen kohdalla." -#: ../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 "Osoittmen kohdalla olevan objektin nimi." -#: ../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 "Leveysaste osoittimen kohdalla." -#: ../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 "Edellisen ja tämänhetkisen segmentin välinen kulma." -#: ../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 "Piirrettävän segmentin suuntima." -#: ../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 "Piirrettävän segmentin pituus." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(ei objektia)" -#: ../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 "taso ei ole listassa." -#: ../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 "" - -#: ../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 "" @@ -3549,10 +3877,4 @@ msgid "File not found" msgstr "Tiedostoa ei löytynyt" - -#: ../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 @@ -3611,7 +3933,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" @@ -3627,5 +3948,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" @@ -3728,5 +4049,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 "" @@ -3737,5 +4058,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" @@ -3749,5 +4070,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 "" @@ -3822,6 +4143,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" @@ -3931,10 +4252,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 "" @@ -3943,19 +4264,19 @@ msgstr "" -#: ../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 "" @@ -3964,5 +4285,5 @@ msgstr "" -#: ../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 "" @@ -3980,9 +4301,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 " @@ -3990,110 +4311,112 @@ 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 "poistettu" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4102,21 +4425,21 @@ msgstr "" -#: ../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 "Rooli" #: ../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 "" @@ -4155,10 +4478,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 @@ -4167,10 +4491,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 @@ -4184,5 +4509,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}" @@ -4223,4 +4548,140 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "ei mitään" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "kaikki" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Valitse väri" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parametri ''{0}'' ei saa olla tyhjä" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Ominaisuutta ei ole vielä toteutettu." + +#: ../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 "Anna poluille tagi" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikti latauksen aikana" + +#: ../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} polku" +msgstr[1] "{0} polkua" + +#: ../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} relaatio" +msgstr[1] "{0} relaatiota" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Vaihda resoluutiota" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Ratkaise ristiriitoja" + +#: ../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 "Liitä" + +#: ../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} polku" +msgstr[1] "{0} polkua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4237,10 +4698,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 @@ -4248,5 +4709,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}" @@ -4277,36 +4738,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 "" @@ -4318,150 +4773,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 "Historia" -#: ../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 "Näytä valittujen kohteiden historia." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Taso: {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 "Relaatiot: {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 "" - -#: ../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 "Lataa kaikki valitut objektit uudelleen ja päivitä lista." #. 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 "Tasot" -#: ../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 "Avaa lista kaikista ladatuista tasoista." -#: ../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 "Poista valittu taso." -#: ../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 "Poista taso" - -#: ../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 "" - -#: ../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 "Näytä/piilota" -#: ../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 "Näytä/piilota valittu taso." -#: ../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 "Siirrä valittu taso rivi ylöspäin." -#: ../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 "Siirrä valittu taso rivi alaspäin." -#: ../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." @@ -4470,28 +4893,22 @@ msgstr[1] "Olet muuttamassa {0} kohdetta." -#: ../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 "Tyhjä arvo poistaa avaimen." -#: ../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 "Muutetaanko arvot?" -#: ../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" @@ -4500,89 +4917,84 @@ msgstr[1] "" -#: ../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 "Valitse avain" -#: ../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 "Valitse arvo" -#: ../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 "Valitse objektit, joiden ominaisuuksia haluat muokata." -#: ../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 "Ominaisuudet/jäsenyydet" -#: ../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 "Valittujen objektien ominaisuudet." #. 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 "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../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 "Lisää" -#: ../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 "Lisää uusi arvo/avain-pari kaikkiin objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Muokkaa ominaisuuksia" -#: ../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 "Muokkaa valitun avaimen arvoa kaikissa objekteissa" -#: ../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 "Ominaisuudet: {0} / Jäsenyydet: {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 "Ominaisuudet / Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Muuta relaatiota" -#: ../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 "Poistetaanko valinta relaatiosta {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 "Poista valittu avain kaikista objekteista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Poista asetukset" @@ -4591,34 +5003,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 "Relaatiot" -#: ../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 "Avaa lista kaikista relaatioista." -#: ../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 "Relaatiot: {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 "Avaa valittu relaatio muokkaimeen" -#: ../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 "Poista valittu relaatio" -#: ../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 "Luo uusi relaatio" -#: ../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 "" @@ -4651,23 +5063,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 "Valinta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} polku" -msgstr[1] "{0} polkua" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relaatio" -msgstr[1] "{0} relaatiota" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4675,14 +5073,9 @@ msgstr "Valinta: {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 "Irroita paneeli" -#: ../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." @@ -4691,64 +5084,96 @@ "työkalupalkin napista." -#: ../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 "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" -#: ../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 "Tekijät" -#: ../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 "Näytä valittujen kohteiden muokkaajat." -#: ../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] "Tekijä" +msgstr[1] "Tekijä" + +#: ../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 +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 "Lisää tietoja tästä ominaisuudesta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Tekijä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objektia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Muokkaajat: {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 "" @@ -4757,47 +5182,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 " @@ -4806,14 +5225,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 "" @@ -4823,9 +5242,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 "" @@ -4835,15 +5254,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4851,5 +5270,5 @@ msgstr "" -#: ../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 " @@ -4857,20 +5276,20 @@ msgstr "" -#: ../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 "" @@ -4879,57 +5298,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 "Siirrä valittuja jäseniä ylöspäin" #. 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 "Siirrä valittuja jäseniä alaspäin" #. 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 " @@ -4938,9 +5357,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 "" @@ -4949,20 +5368,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 @@ -4972,37 +5387,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 "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" -#: ../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 "Lataa jäsenet" -#: ../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 "" @@ -5012,30 +5427,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 "" @@ -5049,22 +5464,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 "Ladataan aikaisia liitännäisiä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5097,34 +5517,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../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 "Ole hyvä ja lisää halutut koordinaatit ensin." -#: ../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 "Ole hyvä ja anna nimi sijainnille." -#: ../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 "Valitse ensin kirjanmerkki." @@ -5181,13 +5588,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 "Anna haettava merkkijono" -#: ../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 "Palvelimelta saatuja paikanhakutuloksia ei voida lukea" @@ -5195,18 +5602,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 "Syötä haettavan paikan nimi:" -#. 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 "Paikat" #. 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 "nimi" @@ -5245,37 +5651,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 "tyyppi" -#: ../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 "lähellä" -#: ../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 "zoom" -#: ../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: " @@ -5284,5 +5690,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 "" @@ -5309,46 +5715,74 @@ msgstr "Karttaruutujen numerot" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Lähetä nykyiset asetukset palvelimelle" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5667,14 +6101,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5850,8 +6298,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" #. @@ -5948,4 +6402,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6059,6 +6516,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 @@ -6066,153 +6523,171 @@ #: 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 "Nimi" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Muuta relaatiota" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Lisää tietoja tästä ominaisuudesta" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Edellinen muutos {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6221,32 +6696,285 @@ msgstr "" -#: ../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 "Kadunnimi" + +#: ../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 "Valitse arvo" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parametri ''{0}'' ei saa olla tyhjä" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Poistu tallentamatta" + +#: ../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 "Tallenna ja poistu" + +#: ../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 "Taso" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Lähetettäessä" + +#: ../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 "Tiedosto" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Lataa uudelleen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "Lue 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 "Ei aikaleimaa pisteelle {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 "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {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 "Ei löytynyt aikaleimallisia kuvia." -#: ../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 @@ -6254,29 +6982,29 @@ msgstr "Luetaan {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 "Geo-merkityt kuvat" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#, java-format +msgid "GPS start: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format -msgid "GPS start: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 -#, java-format msgid "GPS end: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#, java-format +msgid "current delta: {0}s" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 -#, java-format -msgid "current delta: {0}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "aikavyöhyke-ero: " -#: ../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" @@ -6285,14 +7013,14 @@ msgstr[1] "kuvat" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Tahdista kello" -#: ../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 @@ -6300,82 +7028,82 @@ msgstr "JPEG-kuvat (*.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 "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita." -#: ../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 "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Kuva" -#: ../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 "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)" -#: ../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-yksikön aikavyöhyke (ero kuvaan)" -#: ../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 "Tahdista aika GPS-yksikön kanssa" -#: ../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 "Syötettyä aikaa ei voitu tulkita oikein." -#: ../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-piste" -#: ../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 "Muokkaa viivanpiirtotyyliä" +#: ../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 "Käytä globaaleja asetuksia." + #: ../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 "Käytä globaaleja asetuksia." +msgid "Draw lines between points for this layer." +msgstr "Piirrä viivat pisteiden välillä tällä tasolla." #: ../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 "Piirrä viivat pisteiden välillä tällä tasolla." - -#: ../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 "Älä piirrä viivoja pisteiden välillä tällä tasolla." -#: ../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 "Viivanpiirtoasetukset" -#: ../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 "Muokkaa väriä" -#: ../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 "Oletusarvo" -#: ../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" @@ -6435,5 +7163,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}" @@ -6449,10 +7177,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 "Muuta datatasoksi" #: ../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." @@ -6463,11 +7191,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 @@ -6507,4 +7235,9 @@ msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Ladataan dataa" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6523,64 +7256,64 @@ msgstr "" -#: ../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 "Datataso {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 "ladatun alueen ulkopuolella" -#: ../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 "" -#: ../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 "" -#: ../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} koostuu:" -#: ../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} poistettu)" -#: ../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 "" -#: ../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 "Muuta GPX-tasoksi" -#: ../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" @@ -6588,5 +7321,5 @@ msgstr[1] "jäljet" -#: ../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" @@ -6594,5 +7327,5 @@ msgstr[1] "pisteet" -#: ../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" @@ -6601,5 +7334,5 @@ msgstr[1] "jälki, jossa on {0} pistettä" -#: ../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" @@ -6608,5 +7341,5 @@ msgstr[1] "{0}:ssä on {1} jälkeä" -#: ../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" @@ -6615,9 +7348,9 @@ msgstr[1] "{0} pistettä" -#: ../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 "" -#: ../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" @@ -6625,5 +7358,5 @@ msgstr[1] "" -#: ../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" @@ -6642,5 +7375,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}." @@ -6648,5 +7381,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 "" @@ -6674,5 +7407,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 " @@ -6680,5 +7413,5 @@ msgstr "" -#: ../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 " @@ -6686,29 +7419,29 @@ msgstr "" -#: ../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:43 +msgid "There was an error while trying to display the URL for this marker" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "There was an error while trying to display the URL for this marker" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL oli: " -#: ../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 "Virhe näytettäessä URL:ia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Lisäasetukset" -#: ../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 "Muutetaan asetusmuuttujien arvoja suoraan. Käytä tätä vain harkiten!" -#: ../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 @@ -6716,26 +7449,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 "Nykyinen arvo on oletus." -#: ../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 "Oletusarvo on \"{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 "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)" -#: ../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 "Ole hyvä ja valitse muokattava rivi." -#: ../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 @@ -6743,14 +7476,14 @@ msgstr "Uusi arvo {0}:lle" -#: ../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 "Ole hyvä ja valitse poistettava rivi." -#: ../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 "Anna uusi avain/arvo-pari" @@ -6875,40 +7608,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 "Väri" -#: ../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 "Piirtotyyli {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 "Taso: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Valitse" -#: ../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 "Valitse väri {0}:lle" -#: ../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 "Eri objekteille käytetyt värit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Värit" @@ -6952,5 +7685,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Auto" @@ -6972,16 +7705,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 "Polkupyörä" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7011,12 +7745,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 "Jalankulku (foot)" @@ -7193,5 +7927,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 "Näytä käynnistysruutu käynnistyksessä" @@ -7199,23 +7933,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 "Näytä objektin tunnus valintalistassa" #: ../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 "Näytä objektin tunnus valintalistassa" + +#: ../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 "Näytä piirtotilassa apuviiva viimeisimmästä pisteestä" -#: ../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 "" -#: ../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 "Näytä objektin tunnus valintalistassa" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Ulkoasu ja käyttötuntuma" @@ -7247,54 +7992,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 "Muokkaa käytettävien liitännäisten asetuksia." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Lataa lista" -#: ../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 "Päivitä" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Muokkaa sivustoja..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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 "Valitse kohta." +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Muokkaa liitännäissivustoja" #. 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 "Näyttöasetukset" -#: ../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 " @@ -7302,29 +8047,29 @@ msgstr "Asetukset, jotka vaikuttavat ohjelman visuaaliseen ilmeeseen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Yhteysasetukset" -#: ../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-palvelimen yhteysasetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Kartta-asetukset" -#: ../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 "Karttaprojektion ja datatulkinnan asetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Ääniasetukset" -#: ../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 "Äänentoiston ja äänitiedostomerkkien asetukset." -#: ../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 "" @@ -7332,13 +8077,13 @@ "käyttöön." -#: ../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 "Näytä koordinaatit" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projektiometodi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Karttaprojektio" @@ -7371,12 +8116,4 @@ msgid "Proxy server password" msgstr "Välityspalvelimen salasana" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Karttatietokantapalvelun URL" #. 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 @@ -7403,61 +8140,60 @@ msgstr "Pikanäppäin" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Poista valittu lähde listasta." -#: ../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 "" @@ -7635,36 +8371,59 @@ msgstr "Muuttujaryhmät" -#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Lisää kommentti" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Poista valittu taso." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Lisää tietoja tästä ominaisuudesta" #. 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 "Lisäominaisuudet:" -#: ../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 "Käytä esivalintaa \"{0}\" ryhmästä \"{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 "Käytä esivalintaa ”{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 "Tuntematon tyyppi: {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 @@ -7672,15 +8431,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {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 "Virhe käsiteltäessä {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 "" -#: ../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 @@ -7690,22 +8449,22 @@ msgstr[1] "Muuta {0} objektia" -#: ../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 "Ei mitään valittuna!" -#: ../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 "Muuta ominaisuuksia" -#: ../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}''" @@ -7744,11 +8503,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 "Ei voitu lukea \"{0}\":aa" -#: ../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 " @@ -7758,38 +8517,38 @@ "GPL:n alaisia jälkiä." -#: ../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 "GPX-tiedostot" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "gps-jäljen kuvaus" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Lisää tekijän tiedot" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Oikea nimi" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "Sähköposti" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Tekijänoikeudet (URL-osoite)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Ennaltamääritelty" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Tekijänoikeuden vuosi" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Avainsanat" @@ -7799,9 +8558,9 @@ msgstr "Vientiasetukset" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Vie ja tallenna" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7812,10 +8571,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 "Valitse ennaltamääritetty lisenssi" -#: ../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 @@ -7825,12 +8584,12 @@ msgstr "Merkinnät: {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 "" -#: ../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" @@ -7851,6 +8610,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 @@ -7860,20 +8619,40 @@ msgstr "Ladataan OSM-karttatietoja..." -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Valintaan ei lisätty mitään haulla \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7881,34 +8660,34 @@ msgstr "" -#: ../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 -tiedostot" -#: ../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 "Tuodut koordinaatit: " +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Tarkistussummavrihe: " -#: ../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-tuonti onnistui" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA-tuonti epäonnistui" @@ -7919,9 +8698,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7930,15 +8709,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7946,33 +8725,91 @@ msgstr "" -#: ../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 "Luodaan muutoskokoelma..." -#: ../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 "Luodaan muutoskokoelma..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Luodaan muutoskokoelma..." + +#: ../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 "Luodaan muutoskokoelma..." + +#: ../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 "Suljetaan muutoskokoelma..." -#: ../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 "Suljetaan muutoskokoelma..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Luodaan muutoskokoelma..." + +#: ../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 "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Lähetetään..." -#: ../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}." @@ -8000,42 +8837,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Virheellinen salasana tai käyttäjänimi." -#: ../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 "Varoitus: salasana lähetetään salaamattomana." -#: ../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 "Tallenna käyttäjänimi ja salasana (salaamattomana)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Anna salasana" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Kirjaudu sisään" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Karttatietokantapalvelun URL" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM-salasana" -#: ../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." @@ -8044,20 +8889,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM-palvelintiedostot" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8066,5 +8911,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8257,35 +9102,46 @@ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." -#: ../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} jäljellä. Lähetetään {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} jäljellä. Lähetetään {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} jäljellä. Lähetetään {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 "Ei mitään lähetettävää. Hae ensin dataa." + +#: ../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 "Päivitä liitännäiset" -#: ../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 "Lataa liitännäiset" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8298,5 +9154,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." @@ -8305,23 +9161,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8332,15 +9188,15 @@ msgstr "Tapahtui virhe liitännäisessä {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 "" -#: ../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." @@ -8348,15 +9204,15 @@ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu." -#: ../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 "Liitännäistä ei löytynyt: {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 "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten." -#: ../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 " @@ -8366,21 +9222,21 @@ "
asettamalla ”plginmanager.warntime”-asetuksen)" -#: ../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 "Poista liitännäinen käytöstä" -#: ../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 "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?" -#: ../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 " @@ -8390,5 +9246,5 @@ "on oikeus korvata vanhat tiedostot." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8396,10 +9252,10 @@ msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{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 "Liitännäisen sisältämien tietojen mukaan tekijä on {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." @@ -8407,9 +9263,9 @@ "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa." -#: ../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 "Pitäisikö liitännäinen poistaa käytöstä?" -#: ../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 " @@ -8419,13 +9275,13 @@ "liitännäisen käytöstä." -#: ../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" @@ -8436,5 +9292,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" @@ -8443,18 +9299,18 @@ msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Liitännäistietoja ei löytynyt." -#: ../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 "" -#: ../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 "Kaikki asennetut liitännäiset ovat ajantasalla." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8467,9 +9323,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 "Lataa puuttuvat liitännäiset" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8482,35 +9338,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}: Versio {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 "Liitännäinen tulee JOSM:n mukana" -#: ../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 "Virhe luettaessa liitännäisten tiedot sisältävää tiedostoa: {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 "Tämä on nauhoituksen lopun jälkeen" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Virhe äänentoistossa" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Älä tee mitään" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Ilmoita ohjelmavirheestä" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8524,14 +9380,14 @@ "JOSM:n versiota, ilmoita ohjelmavirheestä." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Odottamaton poikkeus" -#: ../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 "Tee virheilmoitus osoitteessa {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 "" @@ -8539,5 +9395,5 @@ "virhetilanteeseen." -#: ../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 " @@ -8547,19 +9403,19 @@ "kirjoittamista." -#: ../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 "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:" -#: ../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 "(Teksti on jo kopioitu leikepöydälle)" -#: ../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 "" -#: ../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 "" @@ -8568,5 +9424,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8575,5 +9431,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8586,5 +9442,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" @@ -8594,5 +9450,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8603,17 +9459,17 @@ "\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 "(Vihje: Voit muokata pikanäppäimiä asetuksista.)" -#: ../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 "" @@ -8622,4 +9478,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8644,9 +9535,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 @@ -8654,27 +9563,40 @@ msgstr "Lähetä jäljet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Julkinen" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in 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 "Kuvaus" -#: ../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}" @@ -8682,47 +9604,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 "Yhdistetään..." -#: ../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 "Lähetys peruttu" -#: ../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 "Virhe lähetettäessä" -#: ../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-jäljen lähetys onnistui" -#: ../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 "Lähetään GPX-jälkeä: {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-tasoa ei valittuna. Ei voida lähettää jälkeä." -#: ../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 "Lähetetään GPX-jälkeä" @@ -8835,19 +9757,19 @@ msgstr "Lataa kuvat uutena tasona." -#: ../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-tiedostot (*.gpx, *.gpx.gx)" -#: ../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 "" -#: ../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 "Virhe tulkittaessa {0}:aa" -#: ../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." @@ -8858,34 +9780,34 @@ "kuva.
Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.
" -#: ../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 "Kuvausaika (kuvan EXIF-tiedoista):" -#: ../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:n aika (lue ylläolevasta kuvasta): " -#: ../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 " [pp/kk/vvvv tt:mm:ss]" -#: ../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 "Ei päivämäärää" -#: ../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 "Avaa toinen kuva" -#: ../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 "" -#: ../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" @@ -8895,69 +9817,69 @@ "Ole hyvä ja syötä aika pyydetyssä muodossa" -#: ../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 "Virheellinen päivämäärä" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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-jälki: " -#: ../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 "Avaa toinen GPX-jälki" -#: ../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 "Aikavyöhyke: " -#: ../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 "" -#: ../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 "Kaikki kuvat" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8966,9 +9888,9 @@ msgstr "" -#: ../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 "Virheellinen aikavyöhyke" -#: ../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 "" @@ -8977,65 +9899,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -9043,13 +9965,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9070,5 +9992,5 @@ msgstr "Virhe tiedostossa {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9081,12 +10003,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 "Valitse kaikki" - -#: ../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 "Virhe ladattaessa tiedostoa" @@ -9117,6 +10038,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9125,21 +10046,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" @@ -9148,37 +10069,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 "" -#: ../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." @@ -9190,18 +10122,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "Ranskan kiinteistörekisteri-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 "" -#: ../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 " @@ -9209,5 +10141,5 @@ msgstr "" -#: ../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). " @@ -9215,39 +10147,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9303,7 +10235,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Yhdistetään OSM-palvelimeen..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 @@ -9341,20 +10272,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" @@ -9362,9 +10293,14 @@ 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 +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" @@ -9372,29 +10308,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "itä" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "pohjoinen" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -msgid "Set Lambert coordinate" -msgstr "" +msgid "Set " +msgstr "Valitse" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9456,6 +10402,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)" @@ -9477,6 +10423,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 "Tyhjä taso" @@ -9492,7 +10438,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Tasot: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10012,6 +10958,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 "vesi" @@ -10024,8 +10970,4 @@ msgid "land" msgstr "maa" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "ei mitään" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10318,9 +11260,9 @@ msgstr "OpenStreetBugs-latauslooppi" -#: ../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 "Näyttä OpenStreetBugs-ongelmat" -#: ../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 " @@ -10329,5 +11271,5 @@ msgstr "" -#: ../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 "" @@ -10894,5 +11836,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 "Kadunnimi" @@ -10911,29 +11853,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 "" @@ -10947,25 +11889,15 @@ msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen " -"lähettämistä." - -#: ../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 "" -#: ../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" @@ -10978,38 +11910,38 @@ "Oletko varma, että haluat jatkaa?" -#: ../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 "" -#: ../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 " @@ -11017,81 +11949,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Yksinkertaista polku" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Poistaa turhat pisteet polusta." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa." -#: ../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?" @@ -11102,25 +12034,25 @@ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Oletko varma?" -#: ../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 "Tarkistusvirheet" -#: ../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 "Ei virheitä" -#: ../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 "Ruudukko" -#: ../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 "" @@ -11211,5 +12143,5 @@ msgstr "Suorittaa datantarkistuksen" -#: ../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 "" @@ -11217,49 +12149,49 @@ "Lähetetäänkö muutokset silti?" -#: ../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 "Avaa tarkistusikkuna." -#: ../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 "Zoomaa ongelmaan" -#: ../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 "Korjaa" -#: ../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 "Korjaa valitut virheet" -#: ../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 "Ohita" -#: ../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 "Ohita valitut virheet seuraavalla kerralla." -#: ../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 "Koko ryhmä" -#: ../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 "Yksittäiset elementit" -#: ../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 "Ei mitään" -#: ../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 "Ohitetaanko koko ryhmä vai yksittäiset elementit?" -#: ../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 "Ohitetaan elementit" -#: ../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" @@ -11283,23 +12215,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 "" "Tämä tarkistaa, jos kaksi polkua, rataa tai vesiväylää risteävät samassa " "tasossa, mutteivät ole yhdistettyinä pisteellä." -#: ../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 "Risteävät polut" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Risteävät polut" -#: ../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 "Päällekkäiset pisteet" -#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Samannimiset solmut" + +#: ../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 "Monista polku" + +#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Luo kopio polusta" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11387,23 +12352,23 @@ "Etsii keskenään lähes samannimisiä polkuja; mahdollisesti kirjoitusvirheitä." -#: ../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 "Ominaisuustarkistin:" -#: ../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 "Etsii virheellisiä avain/arvo-pareja." -#: ../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 "Epäkelpo tagin tarkistussääntö - {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 "Epäkelpo oikeinkirjoituksen tarkistussääntö: {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 "" @@ -11414,7 +12379,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 "Virheelliset avain/arvo-parit" @@ -11422,81 +12387,81 @@ #. 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 "Piirto-ongelma" -#: ../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 "Avain \"{0}\" virheellinen." -#: ../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 "Tyhjät arvot" -#: ../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 "Epäkelpo avain" -#: ../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 "Virheellinen välilyönti avaimessa" -#: ../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 "Arvossa välilyönti alussa tai lopussa" -#: ../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 "Avaimen arvossa HTML-entiteettikoodeja" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "FIXME-avain (korjattavia karttakohteita)" -#: ../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 "Tarkista ominaisuuksien avaimet" -#: ../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 "" "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan." +#: ../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:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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 "" -#: ../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." @@ -11507,84 +12472,84 @@ "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 "Lisää tiedosto" -#: ../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 "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot" -#: ../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 "Tarkista ominaisuuksien arvot." -#: ../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 "" "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin." -#: ../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 "Etsi FIXME:t" -#: ../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 "Etsii solmut ja polut joissa arvona 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 "Tarkista muokkausnäkymän piirto-ongelmat" -#: ../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 "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet." -#: ../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 "Käytä oletussääntötiedostoa." -#: ../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 "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)." +#: ../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 "Käytä oletusoikeinkirjoitussääntöjä." -#: ../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 "" "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)." -#: ../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 "" -#: ../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}''" @@ -11730,7 +12695,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 "rakennus" @@ -11744,5 +12709,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 "alue" @@ -11882,5 +12847,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11925,14 +12890,14 @@ msgstr "" -#: ../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 "Suoristettu kuva..." -#: ../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}" @@ -11943,26 +12908,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 "" -#: ../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 "" -#: ../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 " @@ -11970,37 +12935,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -12013,15 +12996,42 @@ msgstr "Automaattinen lataus" -#: ../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 +msgid "(deactivated)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 "Virheellinen päivämäärä" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12030,89 +13040,100 @@ "resoluutiota" -#: ../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 "Vaihda resoluutiota" -#: ../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 "Tallenna WMS-taso tiedostoon" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Lataa WMS-taso tiedostosta" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../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 "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "WMS-liitännäisen asetukset" -#: ../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 "Voit muokata käytettävissä olevien WMS-palvelinten listaa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "WMS URL (Default)" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../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 "Sovita näkymä valittuihin kohteisiin" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Valitse ainakin yksi polku." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12475,62 +13496,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 "Numero" - -#. 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 "Taso" #. item "Streets/Motorway" combo "Layer" @@ -12545,5 +13511,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 "Kaistat" @@ -12558,5 +13524,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" @@ -12566,10 +13531,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 "Maksiminopeus (km/h)" @@ -12613,9 +13578,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 "Yksisuuntainen" @@ -12663,13 +13628,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 "Silta" @@ -12711,13 +13676,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 "Tunneli" @@ -12757,12 +13722,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 "Maaleikkaus" @@ -12802,12 +13767,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 "Penger" @@ -12963,17 +13928,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 "" @@ -13000,4 +13965,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" @@ -13016,11 +13982,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 "Pinta" @@ -13030,4 +13997,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" @@ -13042,9 +14010,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 "päällystetty" @@ -13052,10 +14021,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 "päällystämätön" + +#: 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 "Alppimaja" + +#: 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 "Vuokraamo" + +#. 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 "metsä" + +#: 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 "pihakatu" #. item "Ways/Track Grade 2" combo "Surface" @@ -13063,12 +14095,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 "mukulakivi" + +#: 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 "sora" + +#: 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 "mukulakivi" + +#: 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 "keskeneräinen" + +#: 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 "ruoho" + +#: 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 "ruoho" + +#: 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 "hiekka" + +#. 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 "maa" #. item "Streets/Residential" text "Width (meters)" @@ -13149,20 +14263,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Liikennöintirajoitukset" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Muokkaa tietä koskevia rajoituksia" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Tietulli" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Umpikuja" @@ -13175,8 +14289,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 "Pääsy (access)" @@ -13211,32 +14325,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 "kyllä" @@ -13249,40 +14378,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 "yksityinen" -#: 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 "" @@ -13295,19 +14424,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 "määränpää" @@ -13330,65 +14459,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 "ei" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Pakettiautot (goods)" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)" @@ -13403,10 +14537,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 "Hevonen" @@ -13422,17 +14556,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 "Moottoripyörä" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13444,30 +14577,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 "Auto" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Julkinen liikenne (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Moottorivene" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Vene" #. 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 "Miniminopeus (km/h)" @@ -13475,25 +14608,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 "Maksimipaino (tonnia)" #. 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 "Kiertoliittymä" @@ -13504,5 +14637,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 "Muokkaa kiertoliittymän/risteyksen ominaisuuksia" @@ -13518,5 +14651,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" #. @@ -13524,9 +14657,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 "Tyyppi" @@ -13546,10 +14679,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 "moottoritie" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "moottoritien_ramppi" @@ -13571,10 +14704,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 "valtatie" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "valtatien_ramppi" @@ -13596,10 +14729,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 "kantatie" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "kantatien_ramppi" @@ -13621,5 +14754,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" @@ -13634,9 +14767,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "yhdystie" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "tie" @@ -13650,9 +14783,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "asuinkatu" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "pihakatu" @@ -13682,10 +14815,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 "" @@ -13715,6 +14848,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 "" @@ -13725,10 +14858,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 "Muokkaa sillan ominaisuuksia" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "" @@ -13736,19 +14869,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Polut" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Rakennettava tie" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Muokkaa rakennettavan tien ominaisuuksia" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Liittymä" @@ -13764,5 +14897,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "kiertoliittymä" @@ -13771,5 +14904,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Ratsastustie" @@ -13777,5 +14910,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Muokkaa ratsastustien ominaisuuksia" @@ -13783,5 +14916,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Pyörätie" @@ -13791,11 +14924,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 "Muokkaa pyörätietä/kevyen liikenteen väylää" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Kävelykatu" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Jalankulkutie" @@ -13804,11 +14943,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Muokkaa jalkakäytävän ominaisuuksia" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Esteet" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Kävelykatu" @@ -13817,5 +14962,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Muokkaa kävelykadun ominaisuuksia" @@ -13823,5 +14968,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Portaat" @@ -13831,5 +14976,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 "Muokkaa portaiden ominaisuuksia" @@ -13838,5 +14983,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Metsätie (track)" @@ -13845,39 +14990,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Muokkaa metsätien ominaisuuksia" -#: 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 "sora" - -#. 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 "maa" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "ruoho" - -#: 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 "hiekka" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "" @@ -13886,5 +15003,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13892,5 +15009,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13899,5 +15016,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13905,5 +15022,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13912,5 +15029,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13918,5 +15035,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13925,5 +15042,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13931,5 +15048,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13938,5 +15055,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13945,5 +15062,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Polku" @@ -13952,19 +15069,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 "Moottorikelkka" -#: 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 "" @@ -13974,5 +15094,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 "" @@ -13980,5 +15100,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -13988,5 +15108,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 "" @@ -13994,5 +15114,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -14002,5 +15122,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 "" @@ -14008,5 +15128,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -14016,5 +15136,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 "" @@ -14022,5 +15142,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -14030,5 +15150,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 "" @@ -14036,5 +15156,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -14044,5 +15164,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 "" @@ -14050,10 +15170,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 "Moottoritien liittymä" @@ -14061,15 +15181,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Muokkaa moottoritien liittymää" #. 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 "" @@ -14077,5 +15197,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -14089,4 +15209,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" #. @@ -14106,18 +15228,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 "Operaattori" @@ -14126,5 +15250,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Liikennevalot" @@ -14134,5 +15258,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -14141,27 +15265,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 "saari" -#: 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 "" @@ -14169,6 +15293,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 "" @@ -14177,11 +15301,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 "" @@ -14189,30 +15313,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 "" @@ -14220,5 +15344,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14227,14 +15351,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14245,14 +15369,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 "Kääntöympyrä" @@ -14262,20 +15386,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 "Nopeuskamera" @@ -14283,5 +15407,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Hätäpuhelin" @@ -14289,5 +15413,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14295,5 +15419,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14302,10 +15426,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Kahluupaikka" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "" @@ -14313,5 +15437,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14319,5 +15443,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14325,11 +15449,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 "" @@ -14337,5 +15461,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Esteet" @@ -14343,5 +15467,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14349,5 +15473,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14392,16 +15516,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 "Sallitut kulkumuodot:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "" @@ -14410,5 +15534,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14416,5 +15540,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14422,10 +15546,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 "" @@ -14433,15 +15557,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 "" @@ -14449,5 +15573,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "" @@ -14455,10 +15579,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 "" @@ -14468,5 +15592,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Pensasaita" @@ -14475,5 +15599,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Aita" @@ -14482,5 +15606,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Muuri" @@ -14488,5 +15612,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Kaupunginmuuri" @@ -14495,5 +15619,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14505,15 +15629,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 "Portti" @@ -14521,50 +15645,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 "" @@ -14572,25 +15696,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 "" @@ -14601,10 +15725,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 "Vesi" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Lähde" @@ -14612,5 +15736,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Muokkaa lähteen ominaisuuksia" @@ -14618,5 +15742,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14624,10 +15748,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 "" @@ -14635,10 +15759,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 "Kanava" @@ -14646,10 +15770,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 "Joki" @@ -14659,5 +15783,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 "Muokkaa joen ominaisuuksia" @@ -14665,15 +15789,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Muokkaa veden ominaisuuksia" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Maa" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Muokkaa maan ominaisuuksia" @@ -14681,15 +15805,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 "Tekojärvi" @@ -14697,15 +15821,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Muokkaa tekojärven ominaisuuksia" #. 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 "" @@ -14713,5 +15837,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Joentörmä" @@ -14720,10 +15844,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Muokkaa joentörmän ominaisuuksia" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Kosteikko" @@ -14734,14 +15858,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 "Muokkaa kosteikon ominaisuuksia" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "suo" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "räme" @@ -14755,35 +15879,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "suo" -#: 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 "Muta" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Muokkaa mudan ominaisuuksia" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Ranta" @@ -14791,20 +15915,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Muokkaa rannan ominaisuuksia" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Lahti" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Muokkaa lahden ominaisuuksia" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Kallio" @@ -14812,10 +15936,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Muokkaa kallion ominaisuuksia" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Rantaviiva" @@ -14823,5 +15947,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Muokkaa rantaviivan ominaisuuksia" @@ -14829,5 +15953,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Lauttareitti" @@ -14835,5 +15959,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14842,5 +15966,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14848,10 +15972,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 "Telakka" @@ -14859,5 +15983,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14865,5 +15989,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Pato" @@ -14871,15 +15995,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 "Sulkuportti" @@ -14888,5 +16012,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14894,20 +16018,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 "Vesiputous" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Muokkaa vesiputouksen ominaisuuksia" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "" @@ -14916,15 +16040,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Venesatama" #. 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 "Laituri" @@ -14932,10 +16056,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Muokkaa laiturin ominaisuuksia" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Lauttaterminaali" @@ -14943,10 +16067,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Muokkaa lauttaterminaalin ominaisuuksia" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "" @@ -14956,5 +16080,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 "" @@ -14962,10 +16086,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Rata" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Rata" @@ -14973,5 +16097,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -15001,8 +16125,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 "" @@ -15016,35 +16140,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 "sivuraide" -#: 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 "Kapean raideleveyden rata" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Muokkaa kapean raideleveyden rataa" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15052,45 +16176,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 "Säilytetty" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Muokkaa museroradan ominaisuuksia" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Pikaraitiotie" #. 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 "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Muokkaa metron ominaisuuksia" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Raitiotie" #. 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 "" @@ -15098,5 +16222,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15105,14 +16229,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Käytöstä poistettu rata" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Purettu rata" @@ -15121,5 +16245,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Tasoristeys" @@ -15128,5 +16252,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Risteys" @@ -15136,5 +16260,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15142,5 +16266,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Kääntöpöytä" @@ -15149,10 +16273,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Köysiradat" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Tuolihissi" @@ -15160,10 +16284,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 "Hiihtohissi" @@ -15171,10 +16295,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Muokkaa hiihtohissin ominaisuuksia" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Köysirata" @@ -15182,10 +16306,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Muokkaa köysiradan ominaisuuksia" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15193,5 +16317,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15199,5 +16323,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 "Asema" @@ -15208,10 +16332,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 "Polttoaine" @@ -15221,9 +16345,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 "Muokkaa huoltoaseman ominaisuuksia" #. 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 "Aukioloajat" + +#. 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" @@ -15243,106 +16596,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Muokkaa pysäköinnin ominaisuuksia" #. 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 "monikerroksinen" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "maanalainen" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Merkitse valmiiksi" + +#. 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 "Maksu" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Paikkojen lukumäärä" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Invapaikkojen lukumäärä" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Invapaikkojen lukumäärä" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Invapaikkojen lukumäärä" + +#: 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 "Autopesula" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Muokkaa autopesulan ominaisuuksia" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Kauppa" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Muokkaa autokaupan ominaisuuksia" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Korjaamo" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Muokkaa autokorjaamon ominaisuuksia" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Vuokraamo" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Muokkaa autovuokraamon ominaisuuksia" + +#. 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 "Muokkaa pyörätelineen ominaisuuksia" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Paikkojen lukumäärä" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "monikerroksinen" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "maanalainen" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Invapaikkojen lukumäärä" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Maksu" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Autopesula" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Muokkaa autopesulan ominaisuuksia" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Kauppa" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Muokkaa autokaupan ominaisuuksia" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Korjaamo" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Muokkaa autokorjaamon ominaisuuksia" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Vuokraamo" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Muokkaa autovuokraamon ominaisuuksia" - -#. 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 "Muokkaa pyörätelineen ominaisuuksia" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia" @@ -15351,15 +16739,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Pyöräkauppa" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Julkinen liikenne" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -15367,5 +16755,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Rautatien seisake" @@ -15373,5 +16761,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Muokkaa rautatien seisaketta" @@ -15379,5 +16767,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Raitiovaunupysäkki" @@ -15386,5 +16774,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Muokkaa raitiovaunupysäkkiä" @@ -15392,5 +16780,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Asemalaituri" @@ -15399,5 +16787,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Muokkaa laiturin asetuksia" @@ -15409,5 +16797,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 "" @@ -15415,10 +16803,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 "Alue" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Metron sisäänkäynti" @@ -15427,10 +16815,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Muokkaa sisäänkäynnin ominaisuuksia" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Pyörätuoli" @@ -15439,5 +16827,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Linja-autoasema" @@ -15446,5 +16834,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Muokkaa linja-autoaseman ominaisuuksia" @@ -15452,5 +16840,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Linja-autopysäkki" @@ -15460,5 +16848,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 "Muokkaa linja-autopysäkin ominaisuuksia" @@ -15467,8 +16855,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 "" @@ -15476,10 +16862,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 "" @@ -15487,5 +16873,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taksi" @@ -15493,5 +16879,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Muokkaa taksitolppaa" @@ -15499,5 +16885,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Lentokenttä" @@ -15505,15 +16891,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15522,5 +16908,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Majoittuminen" @@ -15532,5 +16918,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotelli" @@ -15539,15 +16925,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Muokkaa hotellia" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Tähdet" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motelli" @@ -15555,20 +16941,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Muokkaa motellin ominaisuuksia" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Vierasmaja" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Muokkaa vierasmajan ominaisuuksia" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Alppimaja" @@ -15576,10 +16962,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 "Hostelli" @@ -15587,30 +16973,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 "Matkailuvaunualue" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Muokkaa matkailuvaunualueen ominaisuuksia" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Leirintäalue" @@ -15618,10 +17004,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 "Ruoka ja juoma" @@ -15632,5 +17018,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ravintola" @@ -15638,5 +17024,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Muokkaa ravintolan ominaisuuksia" @@ -15644,5 +17030,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 "" @@ -15650,61 +17036,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 "italialainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "kiinalainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hampurilainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "kreikkalainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "saksalainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "intialainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "paikallinen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turkkilainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "aasialainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thaimaalainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "meksikolainen" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japanilainen" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Pikaruoka" @@ -15712,9 +17098,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Muokkaa pikaruokalan ominaisuuksia" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kahvila" @@ -15722,10 +17108,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Muokkaa kahvilan ominaisuuksia" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "" @@ -15733,20 +17118,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 "" @@ -15754,10 +17137,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 "Yökerho" @@ -15765,33 +17147,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Muokkaa yökerhon ominaisuuksia" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turismi" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Nähtävyys" #. 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 "Aukioloajat" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museo" @@ -15799,10 +17172,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Muokkaa museon ominaisuuksia" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Eläintarha" @@ -15811,10 +17183,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Muokkaa eläintarhan ominaisuuksia" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Näköalapaikka" @@ -15822,25 +17193,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Muokkaa näköalapaikan ominaisuuksia" #. 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 "Teemapuisto" #. 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 "Taideteos" @@ -15848,5 +17218,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "" @@ -15854,86 +17224,210 @@ #. 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 "Kartta" #. 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 "kartta" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "pyöräkartta" +#: 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 "kiinalainen" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Lataa alue" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Liitä" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Iso kaupunki" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "paikallinen" #. 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 "Pyöräily" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Lähde" + +#. 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 "sivuraide" + +#. 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 "Muokkaa maanosan ominaisuuksia" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "Poliisiasema" + +#: build/trans_presets.java:1737 msgid "history" msgstr "historia" -#: 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 "maankäyttö" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Tiedot" + +#. 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 "gps-jäljen kuvaus" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Ääni" + +#. +#: 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 "Puhelinnumero" + +#. 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 "" @@ -15941,25 +17435,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 "Piknik-paikka" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Muokkaa piknik-paikan ominaisuuksia" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historialliset paikat" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Linna" @@ -15968,20 +17462,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Muokkaa linnan ominaisuuksia" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Rauniot" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Muokkaa raunioiden ominaisuuksia" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Arkeologinen kaivaus" @@ -15990,10 +17483,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 "Taistelukenttä" @@ -16001,5 +17493,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "" @@ -16007,15 +17499,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monumentti" #. 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 "Muistomerkki" @@ -16023,45 +17515,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 "Vapaa-ajanviete" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Vesipuisto" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Muokkaa vesipuiston ominaisuuksia" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Leikkipuisto" @@ -16069,15 +17561,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Muokkaa leikkipuiston ominaisuuksia" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Kalastus" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "" @@ -16085,15 +17577,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 "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Muokkaa stadionin ominaisuuksia" @@ -16107,6 +17599,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 "Valitse urheilulaji:" @@ -16498,30 +17990,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 "urheilu" @@ -16531,227 +18023,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 "jousiammunta" -#: 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 "australialainen jalkapallo" -#: 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 "baseball" -#: 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 "koripallo" -#: 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 "kuulapelit" -#: 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 "kiipeily" -#: 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 "kriketti" -#: 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 "krikettiverkko" -#: 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 "kroketti" -#: 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 "pyöräily" -#: 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 "ratsastus" -#: 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 "amerikkalainen jalkapallo" -#: 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 "golf" -#: 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 "voimistelu" -#: 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 "jääkiekko" -#: 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 "rugby" -#: 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 "ammunta" -#: 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 "jalkapallo" -#: 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 "uinti" -#: 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 "pöytätennis" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Urheilukeskus" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Muokkaa urheilukeskuksen ominaisuuksia" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Kenttä" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Muokkaa kentän ominaisuuksia" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Kilparata" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Muokkaa kilparadan ominaisuuksia" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfkenttä" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Muokkaa golf-kentän ominaisuuksia" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Pienoisgolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Muokkaa minigolfin ominaisuuksia" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Urheilu" #. 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 "" @@ -16790,248 +18280,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 "kenttä" -#: 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 "urheilukeskus" -#: 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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "Jousiammunta" #. 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 "Kiipeily" #. 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 "Pyöräily" - -#. 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 "Ratsastus" #. 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 "Voimistelu" #. 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 "Moottoriurheilu" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Muokkaa moottoriurheilun ominaisuuksia" -#: 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 "Unti" #. 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 "Ammunta" @@ -17039,178 +18521,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 "Pallopelit" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Jalkapallo" #. 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 "Amerikkalainen jalkapallo" #. 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 "Australialainen jalkapallo" #. 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 "Baseball" #. 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 "Koripallo" #. 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 "Golf" #. 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 "golfkenttä" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Kuulapeli" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Muokkaa kuulapelin ominaisuuksia" -#: 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 "Kriketti" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Muokkaa kriketin ominaisuuksia" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Krikettiverkko" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Muokkaa krikettiverkon ominaisuuksia" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Kroketti" #. 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 "Jääkiekko" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Muokkaa jääkiekkopaikan ominaisuuksia" -#: 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 "Rugby" #. 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 "Pöytätennis" #. 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 "Tennis" #. 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 "Rakennukset" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Rakennus" @@ -17218,5 +18700,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Julkinen rakennus" @@ -17224,10 +18706,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Muokkaa julkisen rakennuksen ominaisuuksia" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Kaupungintalo" @@ -17235,10 +18717,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Muokkaa kaupungintalon ominaisuuksia" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Suurlähetystö" @@ -17246,10 +18728,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Muokkaa suurlähetystön ominaisuuksia" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Oikeustalo" @@ -17258,10 +18740,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Muokkaa oikeustalon ominaisuuksia" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Vankila" @@ -17270,10 +18752,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Muokkaa vankilan ominaisuuksia" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Poliisiasema" @@ -17283,10 +18765,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 "Muokkaa poliisiaseman ominaisuuksia" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Paloasema" @@ -17295,10 +18777,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Muokkaa paloaseman ominaisuuksia" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postitoimisto" @@ -17306,5 +18788,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Muokkaa postitoimiston ominaisuuksia" @@ -17312,15 +18794,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Lastentarha" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Muokkaa lastentarhan ominaisuuksia" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Koulu" @@ -17328,10 +18810,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Muokkaa koulun ominaisuuksia" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Yliopisto" @@ -17339,10 +18821,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Muokkaa yliopiston ominaisuuksia" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Korkeakoulu" @@ -17350,5 +18832,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Muokkaa korkeakoulun ominaisuuksia" @@ -17356,5 +18838,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Elokuvateatteri" @@ -17363,10 +18845,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Muokkaa elokuvateatterin ominaisuuksia" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Kirjasto" @@ -17375,10 +18857,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Muokkaa kirjaston ominaisuuksia" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Taidekeskus" @@ -17386,10 +18867,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Muokkaa taidekeskuksen ominaisuuksia" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teatteri" @@ -17398,10 +18879,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Muokkaa teatterin ominaisuuksia" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "" @@ -17411,5 +18892,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 "" @@ -17418,6 +18899,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 "Uskonto" @@ -17426,66 +18907,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 "" @@ -17494,81 +18975,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 "Osoitteet" @@ -17577,5 +19058,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Muokkaa osoitetietoja" @@ -17583,5 +19064,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Talon numero" @@ -17589,20 +19070,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Talon nimi" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Kaupungin nimi" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postinumero" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Maakoodi" @@ -17610,5 +19091,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Talonumeroiden interpolointilinja" @@ -17617,5 +19098,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Muokkaa interpolointilinjaa" @@ -17623,71 +19104,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 "pariton" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "parillinen" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "kaikki" - -#: 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 "Tehdas" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Muokkaa tehtaan ominaisuuksia" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Torni" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Muokkaa tornin ominaisuuksia" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vesitorni" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Muokkaa vesitornin ominaisuuksia" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Kaasukello" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Muokkaa kaasukellon ominaisuuksia" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Majakka" @@ -17695,10 +19172,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Muokkaa majakan ominaisuuksia" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Tuulimylly" @@ -17706,10 +19183,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Muokkaa tuulimyllyn ominaisuuksia" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Putki" @@ -17717,10 +19194,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Muokkaa putken ominaisuuksia" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Vedenpuhdistuslaitos" @@ -17730,10 +19207,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 "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Nosturi" @@ -17741,10 +19218,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Muokkaa nosturin ominaisuuksia" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Loisto" @@ -17752,10 +19229,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 "" @@ -17763,10 +19240,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 "Valvontakamera" @@ -17774,5 +19251,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Muokkaa valvontakameran ominaisuuksia" @@ -17780,5 +19257,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "" @@ -17788,39 +19265,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 "tuuli" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vesivoima" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossiilinen polttoaine" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "ydinvoima" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kivihiili" -#: 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 "kaasu" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "" @@ -17829,10 +19306,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 "Muuntamoasema" @@ -17841,5 +19318,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Muokkaa muuntamoaseman ominaisuuksia" @@ -17847,10 +19324,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 "Korkeajännitelinjan torni" @@ -17861,5 +19338,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 "Muokkaa korkeajännitelinjan tornin ominaisuuksia" @@ -17867,5 +19344,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Sähkölinja" @@ -17874,46 +19351,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Muokkaa sähkölinjan ominaisuuksia" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Jännite" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Johtojen määrä" #. 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 "Käymälä" -#. 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 "Postilaatikko" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Puhelin" @@ -17922,5 +19393,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Muokkaa puhelimen ominaisuuksia" @@ -17928,5 +19399,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 "Kolikot" @@ -17934,5 +19405,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 "" @@ -17940,5 +19411,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 "" @@ -17946,5 +19417,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 "" @@ -17952,15 +19423,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 "Luottokortit" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Puhelinkortit" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Kierrätys" @@ -17969,5 +19440,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Muokkaa kierrätyspisteen ominaisuuksia" @@ -17975,80 +19446,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Paristot" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Peltitölkit" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Vaatteet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Lasi" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Paperi" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Romumetalli" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Penkki" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Metsästyslava" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Muokkaa metsästyslavan ominaisuuksia" -#. item "Amenities/Hunting Stand" check "Shelter" -#: build/trans_presets.java:2369 -msgid "Hide" -msgstr "" - -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 -msgid "Lock" -msgstr "" - -#. item "Amenities/Hunting Stand" check "Lock" +#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" +#. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2371 build/trans_presets.java:2771 +#: build/trans_presets.java:2438 build/trans_presets.java:2899 msgid "Height" msgstr "Korkeus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "low" msgstr "" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "half" msgstr "" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "full" msgstr "täysi" -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2440 +msgid "Hide" +msgstr "" + +#: build/trans_presets.java:2441 +msgid "Lock" +msgstr "" + +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Lähde" @@ -18057,10 +19524,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Muokkaa lähteen ominaisuuksia" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Juomavesi" @@ -18069,10 +19536,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Muokkaa juomaveden ominaisuuksia" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -18080,25 +19547,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 "Kaupat" #. 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 "Alppimaja" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Muokkaa kaupungin ominaisuuksia" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Lähikauppa" @@ -18106,10 +19583,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Muokkaa lähikaupan tietoja" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kioski" @@ -18117,10 +19593,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Muokkaa kioskin ominaisuuksia" -#. 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 "Muokkaa linja-autopysäkin ominaisuuksia" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Muokkaa puun ominaisuuksia" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Automaatti" @@ -18128,5 +19623,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Muokkaa automaatin tietoja" @@ -18134,88 +19629,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Automaatin tuotteet" #. 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 "juomat" -#: 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 "" -#: 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 "Lihakauppa" @@ -18223,10 +19718,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Muokkaa lihakaupan ominaisuuksia" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Leipomo" @@ -18234,10 +19728,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Muokkaa leipomon ominaisuuksia" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "" @@ -18245,20 +19738,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 "Luomukauppa" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Muokkaa luomukaupan ominaisuuksia" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "" @@ -18266,60 +19757,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 "" @@ -18327,10 +19812,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 "" @@ -18338,10 +19822,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 "Tee-se-itse-kauppa" @@ -18349,60 +19832,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia" -#. 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 "Kampaamo" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Muokkaa kampaamon ominaisuuksia" -#. 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 "Kuivapesula" @@ -18410,10 +19887,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Muokkaa kuivapesulan ominaisuuksia" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Pesula" @@ -18421,10 +19897,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Muokkaa pesulan ominaisuuksia" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "" @@ -18432,35 +19907,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 "Muokkaa optikon ominaisuuksia" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Raha" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Pankki" @@ -18468,16 +19940,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Muokkaa pankin ominaisuuksia" -#. 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 "Pankkiautomaatti" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Rahanvaihto" @@ -18485,5 +19955,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Muokkaa rahanvaihdon ominaisuuksia" @@ -18491,15 +19961,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Muokkaa pankkiautomaatin ominaisuuksia" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Terveys" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Lääkäri" @@ -18507,20 +19977,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Muokkaa lääkärin ominaisuuksia" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Hammaslääkäri" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Muokkaa hammaslääkärin ominaisuuksia" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apteekki" @@ -18528,5 +19996,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Muokkaa apteekin ominaisuuksia" @@ -18534,10 +20002,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 "Sairaala" @@ -18545,10 +20012,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Muokkaa sairaalan ominaisuuksia" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "" @@ -18557,5 +20024,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18564,20 +20031,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 "Puhelinnumero" #. 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 "" @@ -18585,5 +20052,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 "Eläinlääkäri" @@ -18592,55 +20059,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Muokkaa eläinlääkärin ominaisuuksia" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Maanosa" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Muokkaa maanosan ominaisuuksia" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Maa" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Muokkaa maan ominaisuuksia" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Osavaltio" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Muokkaa osavaltion ominaisuuksia" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Seutu" #. 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 "" @@ -18648,15 +20115,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Iso kaupunki" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Kaupunki" @@ -18664,10 +20131,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Kaupunginosa" @@ -18675,25 +20142,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Muokkaa kaupunginosan ominaisuuksia" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Kunta" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Muokkaa kunnan ominaisuuksia" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Kylä" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Muokkaa kylän ominaisuuksia" @@ -18701,5 +20168,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18707,10 +20174,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 "Saari" @@ -18718,11 +20185,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Muokkaa saaren ominaisuuksia" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "vasen" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Muokkaa linnan ominaisuuksia" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Luolan suuaukko" @@ -18730,10 +20210,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Muokkaa luolan suuaukon ominaisuuksia" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Huippu" @@ -18741,10 +20221,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Muokkaa huipun ominaisuuksia" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Jäätikkö" @@ -18752,10 +20232,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Muokkaa jäätikön ominaisuuksia" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Tulivuori" @@ -18763,70 +20243,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Muokkaa tulivuoren ominaisuuksia" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Rajat" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Kansallinen" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Muokkaa kansallisen rajan ominaisuuksia" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Hallinnollinen" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Muokkaa hallinnollisen rajan ominaisuuksia" #. 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 "Muokkaa poliittisen rajan ominaisuuksia" #. 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 "Muokkaa kansallispuiston rajan ominaisuuksia" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Maankäyttö" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Puu" @@ -18835,15 +20315,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Muokkaa puun ominaisuuksia" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Kasvitieteellinen nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Metsä" @@ -18852,5 +20332,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Muokkaa metsän ominaisuuksia" @@ -18858,17 +20338,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 "havumetsä" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "lehtimetsä" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "sekametsä" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Talousmetsä" @@ -18877,14 +20357,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Muokkaa talousmetsän ominaisuuksia" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Luonnonsuojelualue" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "" @@ -18892,25 +20372,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Kivikko, rakka" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Muokkaa kivikon ominaisuuksia" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Pusikko" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Muokkaa pusikon ominaisuuksia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Tunturi" @@ -18918,10 +20398,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Muokkaa tunturin ominaisuuksia" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Nummi" @@ -18929,5 +20409,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Muokkaa nummen ominaisuuksia" @@ -18935,5 +20415,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)" @@ -18942,45 +20422,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Muokkaa maatilan pihan ominaisuuksia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Peltoalueet" #. 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 "Viinitarha" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Muokkaa viinitarhan ominaisuuksia" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Siirtolapuutarha" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Muokkaa siirtolapuutarhan ominaisuuksia" @@ -18988,25 +20468,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Puutarha" #. 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 "Ruoho" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Muokkaa ruohon ominaisuuksia" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "" @@ -19014,10 +20494,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 "" @@ -19025,20 +20505,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 "Puisto" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Muokkaa puiston ominaisuuksia" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "" @@ -19046,5 +20526,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -19052,15 +20532,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Asuinalue" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Muokkaa asuinalueen ominaisuuksia" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Hautausmaa (pieni)" @@ -19068,9 +20548,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Muokkaa pienen hautausmaan ominaisuuksia" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Hautausmaa" @@ -19078,39 +20558,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Muokkaa hautausmaan ominaisuuksia" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Kaupallinen" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Muokkaa kaupallisen alueen ominaisuuksia" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Toimistoalue" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Muokkaa toimistoalueen ominaisuuksia" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Teollisuusalue" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Muokkaa teollisuusalueen ominaisuuksia" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Rata-alue" @@ -19118,15 +20598,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Muokkaa rata-alueen ominaisuuksia" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Sotilasvoimat" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia" @@ -19134,55 +20614,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Rakennustyömaa" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Muokkaa rakennustyömaan ominaisuuksia" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Purettuja rakennuksia" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Rakentamiselle raivattu alue" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Kaatopaikka" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Muokkaa kaatopaikan ominaisuuksia" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Louhos" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Muokkaa louhoksen ominaisuuksia" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "" @@ -19192,5 +20672,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 "" @@ -19199,10 +20679,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 "" @@ -19210,5 +20690,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19217,5 +20697,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19223,34 +20703,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Kielto" #. 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 "" @@ -19259,15 +20739,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 "" @@ -19275,5 +20755,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19282,5 +20762,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19288,5 +20768,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19358,5 +20838,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 @@ -19365,17 +20845,17 @@ msgstr "polkupyörä" -#: 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 "" @@ -19428,5 +20908,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 @@ -19435,13 +20915,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 "" @@ -19455,10 +20935,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "" @@ -19466,31 +20946,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 "" @@ -19499,30 +20979,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 "" @@ -19960,11 +21440,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 "" @@ -20289,41 +21769,4 @@ #: build/trans_style.java:542 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 "" @@ -22025,5 +23468,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 "" @@ -22622,55 +24065,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22684,5 +24078,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 "turismi" @@ -22754,8 +24148,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 "historiallinen" @@ -22826,8 +24220,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 "" @@ -22841,5 +24235,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "louhos" @@ -22853,5 +24247,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "kaatopaikka" @@ -22873,5 +24267,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "valuma-alue" @@ -22885,5 +24279,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "talousmetsä" @@ -22897,5 +24291,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22918,5 +24312,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22930,5 +24324,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "" @@ -22942,5 +24336,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22954,5 +24348,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22966,5 +24360,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -23021,7 +24415,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 "" @@ -23035,5 +24429,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "hautausmaa" @@ -23046,5 +24440,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "huippu" @@ -23059,5 +24453,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "jäätikkö" @@ -23071,5 +24465,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "tulivuori" @@ -23124,8 +24518,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 "" @@ -23139,5 +24533,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "pusikko" @@ -23151,20 +24545,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "nummi" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "metsä" - #. color water #. 1 @@ -23175,5 +24557,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "muta" @@ -23187,5 +24569,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "ranta" @@ -23263,8 +24645,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 "reitti" @@ -23312,7 +24694,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 "raja" @@ -23454,10 +24836,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 "" @@ -23505,6 +24896,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 "osoite" @@ -23801,4 +25192,46 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia " +#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Poista {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata." + +#~ msgid "Delete Layer" +#~ msgstr "Poista taso" + +#~ msgid "Authors: {0}" +#~ msgstr "Muokkaajat: {0}" + +#~ msgid "Public" +#~ msgstr "Julkinen" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen " +#~ "lähettämistä." + +#~ msgid "map" +#~ msgstr "kartta" + +#~ msgid "bicyclemap" +#~ msgstr "pyöräkartta" + #~ msgid "Aborting..." #~ msgstr "Keskeytetään..." @@ -23818,7 +25251,4 @@ #~ msgid "Object" #~ msgstr "Objekti" - -#~ msgid "Not implemented yet." -#~ msgstr "Ominaisuutta ei ole vielä toteutettu." #~ msgid "Login name (email) to the OSM account." @@ -23942,7 +25372,4 @@ #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa" #~ msgid "" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 17484) +++ /applications/editors/josm/i18n/po/fr.po (revision 17485) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" -"PO-Revision-Date: 2009-08-17 15:35+0000\n" -"Last-Translator: jeromekessler5@gmail.com \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-05 16:41+0000\n" +"Last-Translator: David Crochet \n" "Language-Team: Fr\n" "MIME-Version: 1.0\n" @@ -14,77 +14,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Création de l’interface graphique d'utilisateur (GUI)" #. 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 "Aide" -#: ../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 "La projection {0} ne peut être activée. Utilisation de Mercator" -#: ../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 @@ -94,158 +97,166 @@ #: ../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 "Erreur" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Indication : Certains changements viennent de l’envoi de nouvelles données " -"sur le serveur." - -#: ../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] "" +"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " +"et continuer ?" +msgstr[1] "" +"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " +"et continuer ?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Modifications non enregistrées" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "" -"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " -"et continuer ?" - -#: ../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 "Enregistrer et quitter" -#: ../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 "Annuler et quitter" -#: ../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 "Annuler" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorant l’URL malformé : \"{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 "Avertissement" -#: ../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 "Ignorant l URL malformé du fichier : \"{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 "" +"Lecture du fichier \"{0}\" impossible. L’erreur est :
{1}
" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -270,7 +281,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" @@ -308,5 +320,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" @@ -330,6 +342,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 "Greffons" @@ -344,8 +356,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 "" "ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page " @@ -353,10 +365,20 @@ "\"{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 "" +"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page " +"d’historique des primitives OSM échouera probablement. l’URL de l’API est : " +"\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" "Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -367,5 +389,5 @@ "primitives sélectionnées uniquement." -#: ../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 "Veuillez sélectionner le calque de destination." @@ -375,11 +397,11 @@ msgstr "Sélectionnez le calque de destination" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Fusionner" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -390,5 +412,5 @@ "puisse être fusionné." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Pas de calque de destination" @@ -405,11 +427,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 +460,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 "Latitude" @@ -445,30 +467,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 "Longitude" +#: ../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 "Placer les nœuds en cercle" -#: ../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 "Déplacer les nœuds sélectionnés en un cercle." -#: ../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 +504,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,58 +511,57 @@ msgstr "Outil : {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 "Veuillez sélectionner au moins quatre nœuds." #. 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 "Information" #. 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 "Aligner les nœuds" -#: ../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 "Déplacer les nœuds sélectionnés sur une ligne." -#: ../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 "Veuillez sélectionner au moins trois nœuds." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -551,10 +572,10 @@ "courant : {0}, maximum : {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 "Violation des capacités de l’API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -565,5 +586,5 @@ "primitive supprimée {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -574,9 +595,9 @@ "longueur maximale autorisée {2}. la longueur actuelle est de {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Violation de la condition prédéfinie" -#: ../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}" @@ -585,37 +606,37 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "les données" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "le calque" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "la sélection" -#: ../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 "le conflit" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "téléchargement" +#: ../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 "Zoom sur {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 "Zoomer la vue sur {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 @@ -625,22 +646,22 @@ msgstr "Afficher : {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 "Rien de sélectionné sur lequel zoomer." -#: ../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 "Aucun conflit sur lequel zoomer" +#: ../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 "Fusionner des chemins" -#: ../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 "Fusionner plusieurs chemins en un seul." -#: ../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 "Veuillez sélectionner au moins deux chemins à fusionner." @@ -652,4 +673,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Fusionner quand même" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -659,19 +684,7 @@ "Voulez-vous encore les fusionner ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Fusionner quand même" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Changer les directions ?" - -#: ../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 "" -"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans " -"la même direction. En retourner certaines ?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -679,27 +692,34 @@ msgstr "Inverser et fusionner" -#: ../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 "" +"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans " +"la même direction. En retourner certaines ?" + +#: ../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 "Entrer des valeurs pour tous les conflits." -#: ../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 "Résoudre les conflits" -#: ../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 "Fusionner {0} voies" -#: ../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 "Toutes les voies étaient vides" -#: ../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 " @@ -709,32 +729,32 @@ "une seule chaîne de nœuds)" +#: ../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 "Copier" -#: ../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 "Copier les objets sélectionnés dans la mémoire tampon." -#: ../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 "Veuillez sélectionner quelque chose à copier." +#: ../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 "Créer un cercle" -#: ../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 "Créer un cercle à partir de trois nœuds sélectionnés." -#: ../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 "Ces nœuds ne sont pas en cercle. Abandon." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -746,20 +766,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 "Supprimer" @@ -769,63 +789,64 @@ msgstr "Supprimer les objets sélectionnés." -#: ../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 "Écrire dessus" -#: ../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 "Le fichier existe déjà. Écrire dessus ?" #. 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 "Distribuer les nœuds" -#: ../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 "Distribue les nœuds sélectionnés à égale distance le long d'une ligne." +#: ../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 "Téléchargement depuis 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 "Télécharger des données depuis le serveur 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 "Fichier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Téléchargement" -#: ../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 "Veuillez sélectionner au moins une tâche à télécharger" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Téléchargement des référents depuis 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 "" @@ -833,23 +854,23 @@ "sélectionnées" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Téléchargement des référents..." -#: ../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 "Il y a eu {0} conflits durant l'import." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Conflits durant le téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -858,6 +879,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 "Dupliquer" @@ -881,86 +902,92 @@ msgstr "Quitter l’application." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Toutes les images" + +#: ../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 "Exporter en 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 "Exporter les données vers un fichier 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 "Rien à exporter. Obtenez d’abord des données." -#: ../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 "le paramètre \"{0}\" ne doit pas être nul" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exporter en fichier GPX" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Aide en ligne de 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 "Ouvrir dans le navigateur" -#: ../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 "Édition" -#: ../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 "Recharger" -#: ../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 "" "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM" -#: ../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 "Erreur durant le chargement de la page {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." msgstr "Page d’aide manquante. Créez-la en français." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1014,22 +1041,26 @@ msgstr "Fusionne le calque courant avec un autre calque" +#: ../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 "Fusionner les nœuds" -#: ../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 "Fusionner les nœuds sur le plus ancien" -#: ../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 "Veuillez sélectionner au moins deux nœuds à fusionner." -#: ../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 "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Fusionner tout de même" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1039,9 +1070,5 @@ "vous encore les fusionner ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Fusionner tout de même" - -#: ../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 "" @@ -1049,69 +1076,69 @@ "encore utilisé" -#: ../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 "Fusionner {0} nœuds" +#: ../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 "Fusionner la sélection" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Fusionne les primitives sélectionnées avec un autre calque" +#: ../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 "Mirroir" -#: ../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 "Inverse les nœuds et chemins sélectionnés" -#: ../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 "Veuillez sélectionner au moins un nœud ou chemin" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "haut" -#: ../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 "Déplacer des objets {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "bas" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "gauche" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "droite" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Déplacer {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 "Déplacer les objets {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 "Impossible de déplacer des objets en dehors de la Terre." @@ -1119,5 +1146,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 "Nouveau" @@ -1127,19 +1154,22 @@ msgstr "Créer une nouvelle carte." -#: ../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 "Ouvrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Ouvrir un fichier" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" -"Lecture du fichier \"{0}\" impossible. L’erreur est :
{1}
" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Ouvrir un fichier" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Rôle inconnu \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1177,13 +1207,13 @@ msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Seulement deux nœuds autorisés" -#: ../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 "La selection ne doit contenir uniquement que des chemins" -#: ../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 "" @@ -1191,11 +1221,5 @@ "nœuds." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Veuillez sélectionner des chemins avec des angles droits afin de les " -"orthogonaliser." - -#: ../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 " @@ -1203,10 +1227,14 @@ "projection to get rid of this warning.
Do you want to continue?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +"Vous utilisez la projection EPSG:4326 qui pourrait conduire
à " +"d'indésirables résultats en faisant des alignements rectangulaires." +"
Changez votre projection pour supprimer cet avertissement.
Voulez-" +"vous continuer ?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Seulement un nœud sélectionné" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Orthogonaliser" @@ -1222,14 +1250,27 @@ msgstr "Coller les contenus du presse-papier." -#: ../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 "Coller les étiquettes" -#: ../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 "" "Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Chargement {0}" +msgstr[1] "Chargement {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Restaurer {0} primitives" +msgstr[1] "Restaurer {0} primitives" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1255,37 +1296,32 @@ msgstr "Refaire la dernière action annulée" -#: ../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 "Renommer le calque" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Renommer également le fichier" -#: ../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 "Impossible de renommer le fichier \"{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 "Inverser les chemins" -#: ../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 "Inverser la direction de tous les chemins sélectionnés." -#: ../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 "Veuillez sélectionner au moins un chemin." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Inverser les chemins" @@ -1293,10 +1329,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 "Sauvegarder" #: ../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 "Sauvegarder les données actuelles." @@ -1307,37 +1344,25 @@ msgstr "Le fichier {0} existe. L'écraser ?" -#: ../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 "" -"Erreur interne : impossible de vérifier les conditions pour aucun calque. " -"Merci de signaler ceci comme une erreur." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Aucun document ouvert donc rien à sauvegarder." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +msgstr "Aucun exportateur n'a été trouvés! Rien à sauver." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Document vide" -#: ../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 "Le document ne contient pas de données." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Sauvegarder tout de même" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflits" -#: ../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 " @@ -1347,28 +1372,28 @@ "sauvegardés si vous ne les traitez pas. Continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Rejeter les conflits et sauvegarder" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Sauvegarder le fichier OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Sauvegarder le fichier GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Sauvegarder le calque" +#: ../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 "Enregistrer sous…" -#: ../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 "Sauvegarder les données actuelles dans un nouveau fichier." @@ -1403,33 +1428,33 @@ msgstr "Aide : {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Rapport d'état" -#: ../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 "Copier vers le presse-papier et fermer" -#: ../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 "Fermer" +#: ../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 "Couper un chemin" -#: ../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 "Séparer un chemin au nœud sélectionné." -#: ../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 "La sélection actuelle ne peut pas être utilisée pour couper un chemin." -#: ../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." @@ -1437,5 +1462,5 @@ msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin." -#: ../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 " @@ -1451,9 +1476,9 @@ "sélectionner le chemin également." -#: ../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 "Les nœuds sélectionnés ne font pas partie du même chemin." -#: ../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." @@ -1461,11 +1486,11 @@ msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés" -#: ../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 "" "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire." -#: ../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 " @@ -1475,5 +1500,5 @@ "sélectionner les nœuds au milieu du chemin.)" -#: ../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 " @@ -1481,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 " @@ -1487,8 +1512,34 @@ 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 "Couper le chemin {0} en {1} parties" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Fermeture de la révision..." + +#: ../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 "Fermeture de la révision..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "Il n'y a actuellement pas de calque WMS à ajuster." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Fermeture de la révision..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1506,57 +1557,57 @@ msgstr "Passer à la configuration globale \"{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 "Séparer les chemins" -#: ../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 "Dupliquer les nœuds utilisés par plusieurs chemins." -#: ../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 "Ce nœud n’est pas collé à quelque chose d’autre." -#: ../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 "Aucun de ces nœuds ne sont collés à autre chose." -#: ../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 "Aucun des nœuds de ce chemin ne sont collés à autre chose." -#: ../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 "Rien ne peut être séparé dans la sélection actuelle." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Sélectionner au choix :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Un nœud taggué, ou" -#: ../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 "* Un nœud utilisé par plus d’un chemin, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" + #: ../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 "" -"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." -#: ../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" @@ -1570,9 +1621,9 @@ "sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nœud séparé" -#: ../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" @@ -1580,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" @@ -1624,62 +1675,72 @@ "les données)" -#: ../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 "Mise à jour des données" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "Pas de jeu de données courant trouvé" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Mettre à jour la sélection" -#: ../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 "Met à jour la sélection de primitive depuis le serveur" -#: ../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 "Il n'y a pas de primitive sélectionnée à mettre à jour." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "La sélection est vide" -#: ../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 "Chargement vers 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 "Envoyer tous les changements sur le serveur 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 "" +"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Rien à envoyer. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "" -"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Aucun changement à envoyer." -#: ../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 "Synchroniser {0} {1} seulement" -#: ../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 "Synchroniser tout le jeu de données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1701,17 +1762,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 "Conflit détecté" #. 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 "valeur inattendue retournée. Reçue {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1727,5 +1788,5 @@ "html>" -#: ../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}\"" @@ -1733,27 +1794,65 @@ "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\"" -#: ../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 "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{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 "L’envoi a échoué.
{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 "L’envoi vers l’API OSM a échoué" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Mise à jour des primitives" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Charger ces changements ?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Envoyer les changements" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "éditer la nouvelle relation dans la couche \"{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 "Ajouter un nœud à un chemin existant." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "Charger tous les changements dans une requête" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1763,31 +1862,80 @@ "utiliser une requête par primitive modifiée" -#: ../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 "Fournissez un bref commentaire aux changements que vous envoyez :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Réglages de la carte" + +#: ../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 "jeu de données" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objets à modifier :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Charger ces changements ?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Envoyer les changements" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Téléchargement" +#: ../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] "Objets à ajouter :" +msgstr[1] "Objets à ajouter :" + +#: ../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] "Objets à modifier :" +msgstr[1] "Objets à modifier :" + +#: ../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] "Objets à supprimer :" +msgstr[1] "Objets à supprimer :" + +#: ../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 "Dernier changement le {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1811,20 +1959,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 "Audio : {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 "Accélérer" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Avancer plus vite" @@ -1866,10 +2014,10 @@ msgstr "Lire le marqueur précédent" -#: ../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 "Plus lentement" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Avancer plus lentement" @@ -1897,31 +2045,28 @@ 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 "Aucune donnée importée" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Données 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 "Téléchargement de {0} de {1} ({2} restant(s))" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Mise à jour des données" - -#: ../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 +"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 msgid "Errors during Download" msgstr "Erreurs durant le téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1939,20 +2084,20 @@ "ignorer.
" -#: ../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 "Primitives supprimées ou déplacées" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Mode Suppression" -#: ../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 "Supprimer les nœuds ou les chemins." -#: ../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 @@ -1961,5 +2106,5 @@ msgstr "Mode: {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 " @@ -1970,55 +2115,69 @@ "supprimer tous les objets utilisant cet objet." -#: ../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 "le paramètre \"{0}\" ne doit pas être vide" +#: ../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 "Dessiner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Dessiner des nœuds" -#: ../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 "Mode : Desssiner" -#: ../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 @@ -2026,38 +2185,38 @@ msgstr "sélectionné" -#: ../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 "Impossible d'ajouter un nœud en dehors du monde" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Ajouter un nœud" -#: ../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 "Ajouter un nœud au chemin." -#: ../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 "Connecter le chemin existant au nœud" -#: ../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 "Ajouter un nœud à un chemin existant." -#: ../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 "Ajouter un nœud sur le chemin et le connecter" -#: ../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 "Créer un nouveau nœud." -#: ../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 "Sélectionner le nœud sous le curseur." -#: ../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." @@ -2066,14 +2225,14 @@ msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." -#: ../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 "Commencer un nouveau chemin à partir du dernier nœud." -#: ../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 "Continuer le chemin à partir du dernier nœud." -#: ../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 "Terminer le tracé." @@ -2093,5 +2252,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 "" @@ -2105,5 +2264,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 "Relacher le bouton de souris pour arrêter la rotation." @@ -2122,17 +2281,18 @@ "audio à ce point." +#: ../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 "Sélectionner" -#: ../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 "Sélectionner, déplacer et tourner des objets" -#: ../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" @@ -2141,13 +2301,21 @@ msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Déplacer des éléments" -#: ../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 "Les déplacer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Annuler déplacer" + +#: ../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 "" @@ -2156,13 +2324,9 @@ "Souhaitez vous les déplacer ?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Les déplacer" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Annuler déplacer" - -#: ../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." @@ -2171,5 +2335,5 @@ "fusionner avec le nœud le plus proche." -#: ../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-" @@ -2198,62 +2362,62 @@ "droit de la souris" +#: ../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 "Recherche..." -#: ../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 "Rechercher des objets." -#: ../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 "Impossible de rechercher car il n’y a pas de données chargées." -#: ../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 "Entrer le texte à rechercher." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "remplacer la sélection" -#: ../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 "ajouter à la sélection" -#: ../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 "supprimer de la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "respecter la casse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "expression régulière" +#: ../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' et 'Street' dans n'importe quelle clé ou nom." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' n'importe où dans le nom." -#: ../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 - clé 'type' avec la valeur exacte '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, " @@ -2263,51 +2427,52 @@ "*=valeur, 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 - pas 'Bak' dans le nom." -#: ../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 avec n'importe quelle valeur." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Options spéciales :" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - type de l'objet (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - type de l'objet (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - tous les objets modifiés par l'utilisateur" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objet avec l'ID spécifié" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objet avec l'ID spécifié" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objet avec le nombre de nœuds spécifié" -#: ../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 - tous les objets modifiés" -#: ../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 - tous les objets sélectionnés" -#: ../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 - tous les objets incomplets" -#: ../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 "untagged - tous les objets non étiquetés" -#: ../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" @@ -2316,5 +2481,5 @@ "l'expression" -#: ../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" @@ -2323,55 +2488,55 @@ "l'expression" -#: ../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 "Utilisez | ou OR pour combiner avec le OU logique" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "Utilisez ( et ) pour grouper des expressions" -#: ../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 "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Commencer la recherche" -#: ../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 "Aucun résultat trouvé pour \"{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 "Rien n’a été ajouté à la sélection en recherchant \"{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 "Rien n’a été enlevé à la sélection en recherchant \"{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} résultats trouvés" -#: ../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" @@ -2443,58 +2608,96 @@ msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Charger la sélection" -#: ../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 "Contact de {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Téléchargement..." -#: ../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 "Impossible de lire quelque chose depuis l’URL : \"{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 "Erreur d’analyse dans l’URL : \"{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 "Erreur de communication avec le serveur" -#: ../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 "Ajouter un nœud" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Ajouter {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "Changer {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/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Ensemble de changements {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Ensemble de changements {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Changer la relation" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "enlever \"{0}\" de {1} \"{2}\"" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "enlever \"{0}\" de {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 "enlever \"{0}\" de {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Mettre {0}={1} pour {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 "Mettre {0}={1} pour {2}\"{3}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Mettre {0}={1} pour {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" @@ -2503,10 +2706,10 @@ msgstr[1] "objets" -#: ../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 "Enlever \"{0}\" pour {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}" @@ -2518,5 +2721,5 @@ msgstr "Modifier le rôle du membre de la relation en {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2525,10 +2728,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 "Double conflit" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2537,5 +2740,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}''" @@ -2561,44 +2764,60 @@ msgstr "impossible de résoudre un conflit non arbitré" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Supprimer {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Supprimer {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] "Supprimer {0} {1}" +msgstr[1] "Supprimer {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] "Mode Suppression" +msgstr[1] "Mode Suppression" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Supprimer {0} {1}" +msgstr[1] "Supprimer {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] "Supprimer de la relation" +msgstr[1] "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relation conflictuelle" -#: ../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 "Supprimer de la relation" + +#: ../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 "" "Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n" "Supprimer de la relation ?" -#: ../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 "Supprimer de la relation" - -#: ../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 "" "La sélection \"{0}\" est utilisée par la relation \"{1}\".\n" "Supprimer de la relation ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Séparer le segment du chemin" @@ -2606,6 +2825,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." @@ -2617,5 +2836,5 @@ "voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Confirmation de suppression" @@ -2626,5 +2845,5 @@ msgstr "Résoudre les conflits de suppression dans {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" @@ -2661,10 +2880,20 @@ msgstr "Résoudre les conflits de la liste des membres de la relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "supprimer le membre de la relation {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" @@ -2677,17 +2906,37 @@ msgstr "Séquence" -#: ../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 "Résoudre {0} conflits d’étiquette dans {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 "Résoudre {0} conflits d’étiquette dans {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Restaurer {0} primitives" -#: ../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 "Résoudre les conflits de version de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Résoudre les conflits de version de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Résoudre les conflits de version de {0} {1}" @@ -2714,13 +2963,13 @@ "retournement pour préserver la consistence des données." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relation" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Ancien rôle" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nouveau rôle" @@ -2739,64 +2988,123 @@ #: ../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 "Nouvelle valeur" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Appliquer les changements sélectionnés" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Ne pas appliquer les changements" -#: ../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 "Merci de sélectionner les changements que vous voulez appliquer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Propriétés de " -#: ../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 "Rôles de la relation de référence" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Correction automatique d’étiquette" -#: ../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 "Erreur dans le fichier de configuration aux lignes {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Impossible d’ouvrir le répertoire des préférences : {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 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" +"impossible de définir la référence. la référence d’id {0} ne correspond pas " +"à l'historique d’id {1}" + +#: ../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 "" "Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien " "fichier dans {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 "Préférences sauvegardées sur {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 "Impossible de charger les préférences. Raison : {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 "Impossible de charger les préférences depuis le serveur." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2810,32 +3118,39 @@ msgstr "un conflit est déjà enregistré pour la primitive \"{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 "Degrés décimaux" -#: ../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 "Degrés Minutes Secondes" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../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}" -msgstr "" +msgstr "Ensemble de changements {0}" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 @@ -2844,15 +3159,237 @@ msgstr "paramètre {0} > 0 requis. Reçu {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 "incomplet" - -#: ../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 "Erreur : {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Attention : {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 "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{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 "Il n’y a pas de primitive de version {0} dans cet historique" + +#: ../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 "" +"Il n’y a pas de version valide à la date du \"{0}\" dans cet historique" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "pas de verison plus ancienne trouvée. L’historique est vide." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "pas de version plus récente trouvée. L’historique est vide." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" + +#: ../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 "" +"Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données" + +#: ../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 "paramètre \"{0}\" > 0 attendu, reçu \"{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 "impossible de comparer la primitive d’id \"{0}\" à celle d’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 "" +"le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "La zone n'est pas fermée." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Le multipolygone \"{0}\" n'est pas fermé." + +#. 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 "Membre vide dans la relation." + +#: ../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 "Membre \"{0}\" supprimé de la relation." + +#: ../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 "Chemin \"{0}\" comporte moins de deux points." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Plus d'un chemin d'origine trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Plus d'un chemin \"destination\" trouvé." + +#: ../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 "Plus d'un \"via\" trouvé." + +#: ../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 "Rôle inconnu \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Type de membre inconnu pour \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Pas de chemin d'origine trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Pas de chemin \"destination\" trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Pas de noeud ou de chemin \"via\" trouvé." + +#: ../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 "" +"Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." + +#: ../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 "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"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 "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"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 "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Le style de la restriction {0} n'a pas été trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Non-chemin \"{0}\" dans le multipolygone." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Le chemin intérieur \"{0}\" est à l'extérieur." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" +"Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "non étiqueté" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "texte" + +#. 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 "" +"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive " +"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette " +"contradiction. Je conserve ma primitive. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inactif" + #: ../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" @@ -2861,22 +3398,7 @@ msgstr[1] "nœuds" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Erreur : {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Attention : {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nœuds" - -#: ../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" @@ -2885,12 +3407,7 @@ msgstr[1] "voies" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "chemins" - -#: ../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" @@ -2899,254 +3416,4 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relations" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "jeu de données" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "jeux de données" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} membre" -msgstr[1] "{0} membres" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "highway" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "voie ferrée" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "voie navigable" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "utilisation du terrain" - -#: ../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} nœud" -msgstr[1] "{0} nœuds" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Il n’y a pas de primitive de version {0} dans cet historique" - -#: ../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 "" -"Il n’y a pas de version valide à la date du \"{0}\" dans cet historique" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "pas de verison plus ancienne trouvée. L’historique est vide." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "pas de version plus récente trouvée. L’historique est vide." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" - -#: ../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 "" -"Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données" - -#: ../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 "paramètre \"{0}\" > 0 attendu, reçu \"{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 "impossible de comparer la primitive d’id \"{0}\" à celle d’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 "" -"le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "La zone n'est pas fermée." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Le multipolygone \"{0}\" n'est pas fermé." - -#. 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 "Membre vide dans la relation." - -#: ../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 "Membre \"{0}\" supprimé de la relation." - -#: ../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 "Chemin \"{0}\" comporte moins de deux points." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Plus d'un chemin d'origine trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Plus d'un chemin \"destination\" trouvé." - -#: ../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 "Plus d'un \"via\" trouvé." - -#: ../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 "Rôle inconnu \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Type de membre inconnu pour \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Pas de chemin d'origine trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Pas de chemin \"destination\" trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Pas de noeud ou de chemin \"via\" trouvé." - -#: ../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 "" -"Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." - -#: ../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 "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"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 "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"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 "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Le style de la restriction {0} n'a pas été trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Non-chemin \"{0}\" dans le multipolygone." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Le chemin intérieur \"{0}\" est à l'extérieur." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" -"Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "non étiqueté" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "texte" - -#. 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 "" -"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive " -"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette " -"contradiction. Je conserve ma primitive. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inactif" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3159,5 +3426,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "arrière-plan" @@ -3167,5 +3434,5 @@ msgstr "surligner" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "WGS84 Geographic" @@ -3175,5 +3442,5 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3189,21 +3456,21 @@ "et démarrez un nouveau calque sur cette nouvelle zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert Zone (France)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert Zone (Estonie)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Grille Suisse" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3223,22 +3490,70 @@ #: ../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 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Les signets ne peuvent être lus.
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "Les signets ne peuvent être écrits.
{0}" #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Ne plus afficher" -#: ../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/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 "incomplet" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "highway" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "voie ferrée" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "voie navigable" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "utilisation du terrain" + +#: ../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} nœud" +msgstr[1] "{0} nœuds" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} membre" +msgstr[1] "{0} membres" + +#: ../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 "" "Impossible d’initialiser la communication avec le serveur OSM {0}.\n" @@ -3246,5 +3561,43 @@ "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 "inconnu" + +#: ../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 "" @@ -3257,36 +3610,9 @@ "d’erreur est :
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Condition préalable non remplie" -#: ../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 "inconnu" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3296,9 +3622,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 +msgstr "Exception de sécurité" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3309,9 +3635,9 @@ "votre connexion internet." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +msgstr "Exception de réseau" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3320,9 +3646,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 "" @@ -3332,9 +3669,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3347,12 +3684,7 @@ "message d’erreur est :
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitive déjà supprimée" - -#: ../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 @@ -3369,39 +3701,39 @@ msgstr "Téléchargement du \"Message du jour\"" -#: ../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 "Charger les préférences" -#: ../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 "Charger les préférences actuelles vers le serveur" -#: ../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 "chaîne de caractères" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nom de l’utilisateur." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Mot de passe 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 "" "Redimensionner l'applet aux dimensions suivantes (format : LARGEURxHAUTEUR)" -#: ../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 "texte;texte;..." -#: ../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 " @@ -3411,5 +3743,5 @@ "contenant lat=y&lon=x&zoom=z ou encore un nom de fichier." -#: ../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 " @@ -3419,5 +3751,5 @@ "y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." -#: ../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 " @@ -3427,76 +3759,95 @@ "caractères comme pour Google ou un URL retournant du osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "n’importe" -#: ../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 "" "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci." -#: ../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 "Nom d’utilisateur" -#: ../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 "Mot de passe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "Options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Montrer cette aide" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Argument de géométrie standard 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 "Télécharge la zone sélectionnée" -#: ../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 "Télécharge l’emplacement donné par l’URL (avec 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 "Ouvrir fichier (données brutes gps, si .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 "Télécharger la zone sélectionnée en données GPS brut." -#: ../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 "Sélectionner avec la recherche actuelle" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Lancer maximisé" -#: ../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 "Rétablir les préférences par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Définir la langue" -#: ../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 "exemples" -#: ../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" @@ -3507,47 +3858,47 @@ "sur d’avoir chargé des données avant --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 "Au lieu de --download= vous devriez indiquer 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 "Activation des greffons mis à jour" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Chargement des premiers greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Régalage des valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Chargement des greffons" -#: ../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." msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Outils" -#: ../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 "Balises" -#: ../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 @@ -3559,21 +3910,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 "Affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Bascule vers l'affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Basculer en mode plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3613,59 +3964,45 @@ msgstr "Zoom arrière" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "échelle" -#: ../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 "La longitude géographique au niveau du pointeur de souris." -#: ../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 "Le nom de l’objet au niveau du pointeur de souris." -#: ../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 "La latitude géographique au niveau du pointeur de souris." -#: ../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 "L'angle entre le segment de chemin précédent et l’actuel." -#: ../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 "L’orientation (boussole) du segment en train d’être dessiné." -#: ../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 "La longueur du nouveau segment du chemin étant actuellement dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(aucun objet)" -#: ../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 "le calque n’est pas dans la liste." -#: ../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 "La couche \"{0}\" doit se trouver dans la liste des couches" - -#: ../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 @@ -3676,10 +4013,4 @@ msgid "File not found" msgstr "Fichier non trouvé" - -#: ../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 @@ -3741,7 +4072,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" @@ -3757,5 +4087,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" @@ -3862,5 +4192,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 "Ma version" @@ -3871,5 +4201,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" @@ -3885,5 +4215,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 "Leur version" @@ -3971,6 +4301,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" @@ -4086,10 +4416,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 "index de colonne inattendu. Reçu {0}" -#: ../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 "" @@ -4100,19 +4430,19 @@ "serveur
Détails :{0}" -#: ../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 "La communication avec le serveur a échoué" -#: ../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 "Oui, les restaurer également" -#: ../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 "Non, annuler l’opération" -#: ../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 "" @@ -4123,5 +4453,5 @@ "supprimés du serveur.

Voulez-vous les restaurer également ?" -#: ../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 "Restaurer ces nœuds également ?" @@ -4142,9 +4472,9 @@ msgstr "Restaurer les primitives ?" -#: ../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 "Propriétés de mon jeu de données, i.e. les données locales" -#: ../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 " @@ -4154,95 +4484,97 @@ "éléments lorsque la fusion sera appliquée." -#: ../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 "Propriétés de leur jeu de données, i.e. les données du serveur" -#: ../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 "Coordonnées :" -#: ../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 "Etat supprimé :" -#: ../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 "État visible :" -#: ../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 "(aucun)" -#: ../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 "supprimé" -#: ../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 "non supprimé" -#: ../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 "visible (sur le serveur)" -#: ../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 "non visible (sur le serveur)" -#: ../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 "Garder une copie de la version locale" -#: ../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 "Supprimer physiquement du jeu de données local" -#: ../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 "Conserver mes coordonnées" -#: ../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 "Conserver leurs coordonnées" -#: ../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 "Ne pas résoudre le conflit de coordonnées" -#: ../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 "Conserver mon état supprimé" -#: ../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 "Conserver leur état supprimé" -#: ../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 "Ne pas résoudre le conflit d'état" -#: ../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 "Conserver mon état de visibilité" -#: ../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 "Oui, réinitialiser l’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 "Non, annuler" -#: ../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 "" "Pour conserver votre version locale, JOSM
doit réinitialiser l’id " @@ -4250,17 +4582,17 @@ "id
Êtes-vous d'accord ?" -#: ../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 "Réinitialisation de l’id à 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 "Conserver l'état de visbilité du serveur" -#: ../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 "Oui, le supprimer" -#: ../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 "" @@ -4271,21 +4603,21 @@ "données.
Êtes-vous d'accord ?" -#: ../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 "Suppression du jeu de données" -#: ../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 "Conflit non résolu entre deux états de visiblité" #: ../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 "Rôle" #: ../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 "Primitive" @@ -4327,10 +4659,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 @@ -4339,10 +4672,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 @@ -4358,5 +4692,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}" @@ -4397,4 +4731,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {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 "rien" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "all" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Choisir une couleur" + +#: ../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 "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{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 "le paramètre \"{0}\" ne doit pas être vide" + +#: ../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 "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {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 "non supprimé" + +#: ../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 "Pas encore implémenté." + +#: ../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 "chemin d'origine" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Conflits dans les données" + +#: ../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} voie" +msgstr[1] "{0} voies" + +#: ../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} relation" +msgstr[1] "{0} relations" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Résolution de conflits" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Résoudre les conflits" + +#: ../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 "Appliquer" + +#: ../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 "Coller" + +#: ../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} voie" +msgstr[1] "{0} voies" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4410,10 +4881,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 @@ -4421,5 +4892,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}" @@ -4452,5 +4923,5 @@ #: ../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." @@ -4459,31 +4930,25 @@ "liste." -#: ../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 "Annule la résolution de conflits et ferme la boite de dialogue" -#: ../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 "Applique la résolution de conflits et ferme la boite de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Appliquer la résolution" -#: ../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 "Continuer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4495,152 +4960,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 +msgstr "Conflit partiellement résolu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Résoudre les conflits" -#: ../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 +msgstr "Résolution des conflits pour ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 msgid "History" msgstr "Historique" -#: ../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 "Afficher l’historique de tous les articles sélectionnés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Impossible de charger l’historique depuis le serveur. Détails :
{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 "index en dehors des limites. Reçu {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 "Nœud {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 "Couche : {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 "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Historique de l’objet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Chargement de l'historique" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Chargement de l’historique de {0} d’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 "Recharger les objets actuellement sélectionnés et rafraîchir la liste." #. 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 "Afficher" -#: ../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 "Afficher l'historique de la primitive sélectionnée" -#: ../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 "Calques" -#: ../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 "Ouvrir une liste de tous les calques chargés." -#: ../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 "Supprimer le calque sélectionné." -#: ../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 "Supprimer le calque" - -#: ../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 "" - -#: ../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 "Confirmation" - -#: ../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 "Tout supprimer" - -#: ../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 "Montrer/Cacher" -#: ../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 "Bascule l'état de visibilité du calque sélectionné." -#: ../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 "Active la couche sélectionnée" -#: ../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 "Fusionne cette couche dans une autre" -#: ../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 "Déplacer le calque sélectionné un niveau vers le haut." -#: ../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 "Déplacer le calque sélectionné un niveau vers le bas." -#: ../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." @@ -4649,28 +5080,22 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../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 "Une valeur vide supprime la clé." -#: ../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 "Changer les valeurs ?" -#: ../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" @@ -4679,90 +5104,85 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../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 "Veuillez sélectionner une clé" -#: ../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 "Veuillez sélectionner une valeur" -#: ../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 "" "Veuillez sélectionner les objets dont vous voulez changer les propriétés." -#: ../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 "Propriétés/Appartenances" -#: ../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 "Propriétés des objets sélectionnés." #. 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 "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../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 "Ajouter" -#: ../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 "Ajouter une nouvelle paire clé/valeur à tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Éditer les propriétés" -#: ../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 "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../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 "Propriétés : {0} / Appartenances : {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 "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Changer la relation" -#: ../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 "Supprimer vraiment la sélection de la relation {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 "Supprimer la clé sélectionnée de tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Supprimer les propriétés" @@ -4771,34 +5191,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 "Relations" -#: ../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 "Ouvrir une liste de toutes les relations." -#: ../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 "Relations : {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 "Ouvrir un éditeur pour la relation sélectionnée" -#: ../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 "Supprimer la relation sélectionnée" -#: ../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 "Créer une nouvelle relation" -#: ../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 "" @@ -4833,23 +5253,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 "Sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} voie" -msgstr[1] "{0} voies" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relation" -msgstr[1] "{0} relations" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4857,14 +5263,9 @@ msgstr "Sélection : {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 "Détacher le panneau" -#: ../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." @@ -4873,65 +5274,100 @@ "d'outils de gauche." -#: ../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 "Cliquer pour minimiser/maximiser le contenu du panneau" -#: ../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 "Auteurs" -#: ../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 "" "Ouvrir une liste des personnes travaillant sur les objets sélectionnés." -#: ../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] "Auteur" +msgstr[1] "Auteur" + +#: ../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 "Afficher" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Plus d'informations à propos de cette balise" + +#: ../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 "" +"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} " +"primitives sélectionnées uniquement." + +#: ../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 "Auteur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Auteurs : {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 +msgstr "éditer la relation en référence du membre de relation sélectionné" + +#: ../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 +msgstr "Télécharger toutes les relations enfants (récursivement)" + +#: ../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 +msgstr "Télécharger les relations sélectionnée." + +#: ../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 "télécharger les membres de la relation" -#: ../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 "Conflits dans les données" -#: ../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 "" @@ -4939,19 +5375,21 @@ "loaded" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +"La relation enfant
{0}
est supprimée sur le serveur et ne peut " +"être chargée." + +#: ../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 +msgstr "La relation est supprimée." + +#: ../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 +msgstr "Téléchargement de la relation {0}" + +#: ../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}" @@ -4959,29 +5397,23 @@ "Attention : exception ignorée car la tâche est annulée. Exception : {0}" -#: ../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 "Étiquettes et membres" -#: ../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 +msgstr "Relations parentes" + +#: ../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 "" +msgstr "Relations enfants" #. --- 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 +msgstr "Rôle :" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 msgid "" "There is at least one member in this relation referring
to the " @@ -4990,14 +5422,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 "" @@ -5007,9 +5439,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 "" @@ -5019,5 +5451,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" @@ -5026,5 +5458,5 @@ "premier membre" -#: ../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" @@ -5033,5 +5465,5 @@ "dernier membre" -#: ../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 " @@ -5039,5 +5471,5 @@ msgstr "" -#: ../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 " @@ -5045,20 +5477,20 @@ msgstr "" -#: ../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 "Éditeur de relation : supprimer la sélection" -#: ../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 "" @@ -5067,57 +5499,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 "trier les membres de la relation" #. 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 "éditeur de relation : trier" -#: ../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 "Déplacer les membres sélectionnés vers le haut" #. 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 "Éditeur de relation : déplacer vers le haut" -#: ../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 "Déplacer les membres sélectionnés vers le bas" #. 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 "Éditeur de relation : déplacer vers le bas" -#: ../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 "éditeur de relation : supprimer" -#: ../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 +msgstr "Supprimer la relation actuellement éditée." + +#: ../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 +msgstr "Oui, créer un conflit et fermer." + +#: ../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 +msgstr "Non, continuer à éditer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5126,9 +5558,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 +msgstr "Conflit dans les données." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 #, java-format msgid "" @@ -5137,20 +5569,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 "Appliquer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Appliquer les changements et fermer" -#: ../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 @@ -5160,37 +5588,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 "Annuler les changements et fermer" -#: ../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 "Ajouter une étiquette vide" -#: ../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 "Supprimer les étiquettes sélectionnées" -#: ../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 "Télécharger tous les chemins et les nœuds incomplets dans la relation" -#: ../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 "Télécharger les membres" -#: ../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 "Éditeur de relation : télécharger les membres" -#: ../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 "Définir un rôle pour les membres sélectionnés" -#: ../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 "Appliquer le rôle" -#: ../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 "" @@ -5200,30 +5628,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 +msgstr "Oui, l'appliquer." + +#: ../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 +msgstr "Non, ne pas l'appliquer." + +#: ../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 "" @@ -5237,22 +5665,27 @@ msgstr "Lié" -#: ../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 "télécharger les relations référentes" -#: ../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 "Charger les relations parentes" -#: ../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 "Charger les relations parentes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "éditer la relation sélectionnée" @@ -5285,34 +5718,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] "Enlever des clés anciennes d'au maximum {0} objet" -msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Marque-pages" -#: ../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 "Entrer les coordonnées désirées en premier." -#: ../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 "Entrer un nom pour cet emplacement." -#: ../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 "Sélectionner un marque-page en premier." @@ -5372,13 +5792,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 "Erreur de pointeur nul, des étiquettes sont peut-être manquantes." -#: ../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 "Veuillez saisir une chaîne de caractères pour la recherche" -#: ../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 "" @@ -5387,18 +5807,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 "Entrez un nom d’endroit à rechercher :" -#. 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 "Lieux/endroits" #. 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 "nom" @@ -5437,37 +5856,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 "type" -#: ../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 "à côté de" -#: ../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 "zoom" -#: ../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: " @@ -5476,5 +5895,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 "Carte glissante" @@ -5501,20 +5920,29 @@ msgstr "Numéros des tuiles" -#: ../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 "Historique de {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 "Historique de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historique de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Fermer la boîte de dialogue" -#: ../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 "Afficher l'historique de la primitive sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" @@ -5522,6 +5950,6 @@ "primitive." -#: ../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}" @@ -5530,5 +5958,5 @@ "à l'historique d’id {1}" -#: ../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" @@ -5537,5 +5965,5 @@ "pas disponible dans l’historique" -#: ../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 "" @@ -5543,5 +5971,5 @@ "courante." -#: ../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" @@ -5550,8 +5978,27 @@ "disponible dans l’historique" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Nœud {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Chargement de l'historique" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Chargement de l’historique de {0} d’id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Chargement de l’historique de {0} d’id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Chargement de l’historique de {0} d’id {1}" #. item "Streets/Motorway" text "Reference" @@ -5869,14 +6316,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6052,8 +6513,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" #. @@ -6150,4 +6617,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6261,6 +6731,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 @@ -6268,156 +6738,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 "Nom" -#: ../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 "" "Version {0} créée le {1} par " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Ensemble de changements {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Plus d'informations à propos de cette balise" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Ensemble de changements {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6425,32 +6913,287 @@ msgstr "Version {0} créée le {1} par {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Version" -#: ../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 "Nom de la rue" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Oui" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Non" + +#: ../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 "Veuillez sélectionner une valeur" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "La couche \"{0}\" doit se trouver dans la liste des couches" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Corriger les conflits d'étiquettes" + +#: ../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] "" + +#: ../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] "" + +#: ../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 "Annuler et quitter" + +#: ../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 "Enregistrer et quitter" + +#: ../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 "Calque" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "À l’envoi" + +#: ../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 "Fichier" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Téléchargement" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Images pour {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 "Lecture 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 "Aucune heure pour le point {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 "Impossible de lire l’heure \"{0}\" du point {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 "Aucune image avec des informations horaires lisibles trouvée." -#: ../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 @@ -6458,29 +7201,29 @@ msgstr "Lecture de {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 "Images géolocalisées" -#: ../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 "Allumage du 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 "Extinction du 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 "variation différentielle actuelle : {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "différence de fuseau horaire : " -#: ../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" @@ -6489,14 +7232,14 @@ msgstr[1] "images" -#: ../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} dans la trace." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synchroniser l’horloge" -#: ../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 @@ -6504,82 +7247,82 @@ msgstr "images 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 "La date du fichier \"{0}\" n'a pas pu être analysée." -#: ../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 "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Image" -#: ../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 "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" -#: ../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 "Fuseau horaire de l'instrument GPS (différence avec la photo)" -#: ../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 "Synchroniser l’heure avec l’instrument 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 "La date indiquée ne peut être analysée." -#: ../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 "point 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 "Personnaliser le dessin des lignes" +#: ../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 "Utiliser les réglages généraux." + #: ../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 "Utiliser les réglages généraux." +msgid "Draw lines between points for this layer." +msgstr "Dessiner des lignes entre les points pour ce calque." #: ../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 "Dessiner des lignes entre les points pour ce calque." - -#: ../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 "Ne pas dessiner de ligne entre les points pour ce calque." -#: ../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 "Sélectionner les options de dessin des lignes" -#: ../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 "Personnaliser la couleur" -#: ../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 "Par défaut" -#: ../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" @@ -6639,5 +7382,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}" @@ -6653,10 +7396,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 "Convertir en calque de données" #: ../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." @@ -6668,11 +7411,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 @@ -6714,4 +7457,9 @@ "Voulez-vous
continuer ?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Téléchargement des données" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6736,19 +7484,19 @@ "estimer leur horodatage ont été omis." -#: ../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 "Couche de données {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 "en dehors de la zone téléchargée" -#: ../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 "version {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 "" @@ -6756,46 +7504,46 @@ "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} est consistué de :" -#: ../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} supprimés)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "non défini" -#: ../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 "Version de l’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 "Convertir en calque 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" @@ -6803,5 +7551,5 @@ msgstr[1] "traces" -#: ../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" @@ -6809,5 +7557,5 @@ msgstr[1] "points" -#: ../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" @@ -6816,5 +7564,5 @@ msgstr[1] "une trace avec {0} points" -#: ../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" @@ -6823,5 +7571,5 @@ msgstr[1] "{0} est constitué de {1} traces" -#: ../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" @@ -6830,9 +7578,9 @@ msgstr[1] "{0} points" -#: ../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 "marqueur 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" @@ -6840,5 +7588,5 @@ msgstr[1] "marqueurs" -#: ../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" @@ -6859,5 +7607,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}." @@ -6865,5 +7613,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 "Impossible de synchroniser dans le calque actuellemnt lu." @@ -6895,5 +7643,5 @@ msgstr "Bascule l'état de visibilté du marqueur de texte et d'icônes." -#: ../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 " @@ -6903,5 +7651,5 @@ "laquelle vous voulez l'associer (après le premier marqueur)." -#: ../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 " @@ -6911,29 +7659,29 @@ "marqueur audio ou sur le point de la trace où vous voulez synchroniser." -#: ../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 "Impossible de créer un nouveau marqueur audio." -#: ../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 "Il y a eu une erreur en essayant d’afficher l’URL pour ce marqueur" -#: ../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 "(L’URL était : " -#: ../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 "Erreur à l'affichage de l'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 "Configuration avancée" -#: ../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 "Régler les préférences directement. À utiliser avec précaution !" -#: ../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 @@ -6941,14 +7689,14 @@ msgstr "Rechercher : " -#: ../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 "La valeur actuelle est par défaut." -#: ../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 "La valeur par défaut est \"{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 "" @@ -6956,13 +7704,13 @@ "été utilisé)." -#: ../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 "Veuille sélectionnez la rangée à éditer." -#: ../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 @@ -6970,14 +7718,14 @@ msgstr "Nouvelle valeur pour {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 "Veuillez sélectionnez la rangée à supprimer." -#: ../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 "Entrez une nouvelle paire clé/valeur" @@ -7123,40 +7871,40 @@ msgstr "Calibration de l’enregistrement de la voix" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Couleur" -#: ../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 "Style de rendu {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 "Couche : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Choisir" -#: ../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 "Choisir une couleur pour {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 "Mettre la valeur par défaut" -#: ../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 "Réinitialiser" -#: ../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 "Couleurs utilisées par les différents objets dans JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Couleurs" @@ -7202,5 +7950,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Voiture" @@ -7222,16 +7970,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 "Vélos" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7261,12 +8010,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 "Piétons" @@ -7459,5 +8208,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 "Afficher l'écran de démarrage" @@ -7465,18 +8214,29 @@ #. 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 "Montrer l'ID de l'objet dans les listes de sélections" #: ../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 "Montrer l'ID de l'objet dans les listes de sélections" + +#: ../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 "Dessiner la ligne d'aide" -#: ../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 "Fonctionnement sans mode (comme 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 "Montrer l'ID de l'objet dans les listes de sélections" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" @@ -7484,6 +8244,6 @@ "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 "Apparence et ressenti" @@ -7515,54 +8275,54 @@ msgstr "style utilisé" -#: ../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 "Configurer les greffons disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Télécharger la liste" -#: ../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 "Actualiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Configurer les sites..." -#: ../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 "Ajouter une description à l'URL des greffons de 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 +msgstr "Saisir l'URL" + +#: ../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 "Veuillez sélectionner une entrée." -#: ../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 "Modifier la description de l'URL des greffons de 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 "Configurer les sites de greffon." #. 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 "Réglages de l’affichage" -#: ../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 " @@ -7570,42 +8330,42 @@ msgstr "Divers réglages de l’apparence de tout le programme." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Réglages de connexion" -#: ../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 "Paramètres de connexion du serveur 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 "Réglages de la carte" -#: ../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 "" "Réglages pour la projection de la carte et l’interprétation des données." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Paramètres Audio" -#: ../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 "Réglages pour le lecteur et les marqueurs audios." -#: ../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 "Vous devez redémarrer JOSM pour que certains réglages prennent effet." -#: ../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 "Afficher les coordonnées en" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Méthode de projection" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Projection de la carte" @@ -7638,12 +8398,4 @@ msgid "Proxy server password" msgstr "Mot de passe du serveur mandataire" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "URL de base du serveur OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL du serveur de base" #. 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 @@ -7670,61 +8422,60 @@ msgstr "Raccourci" -#: ../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 "Description brève : {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 "auteur : {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 "page web : {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 "Version: {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 "Chemins des icônes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Copier les valeurs par défaut" -#: ../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 "Veuillez sélectionner la colonne à copier" -#: ../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 "Ajouter une nouvelle source XML à la liste" -#: ../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 "Supprimer la source sélectionnée de la liste." -#: ../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 "" @@ -7915,36 +8666,59 @@ msgstr "Touches de raccourcis" -#: ../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] "Enlever des clés anciennes d'au maximum {0} objet" +msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Ajouter un nouveau calque" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Supprimer le calque sélectionné." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Plus d'informations à propos de cette balise" #. 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 "Attributs optionnels:" -#: ../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 "Utiliser la balise \"{0}\" du groupe \"{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 "Utiliser la balise \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "voie sans issue" -#: ../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 "Type inconnu : {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 @@ -7952,15 +8726,15 @@ msgstr "Impossible de lire la source des balises prédéfinies : {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 "Erreur de traitement {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 "Les éléments de type {0} sont avalisés." -#: ../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 @@ -7970,22 +8744,22 @@ msgstr[1] "Changer {0} objets." -#: ../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 "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Changer les propriétés" -#: ../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}''" @@ -8026,11 +8800,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 "Impossible de lire \"{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 " @@ -8040,38 +8814,38 @@ "de traces sous licence 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 "Fichiers GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "description de la trace GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Ajouter des informations sur l’auteur" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nom réel" -#: ../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 "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Prédéfini" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Année du copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Mots-clés" @@ -8081,9 +8855,9 @@ msgstr "Options d’export" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exporter et sauvegarder" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8094,10 +8868,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 "Choisir une licence prédéfinie" -#: ../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 @@ -8107,12 +8881,12 @@ msgstr "Marqueurs de {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 "Le fichier \"{0}\" n'existe pas" -#: ../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" @@ -8137,6 +8911,6 @@ "déduire le type de primitive" -#: ../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 @@ -8146,10 +8920,20 @@ msgstr "Téléchargement des données 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 "éditer la relation #{0} dans la couche \"{1}" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8157,10 +8941,20 @@ "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant." -#: ../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 "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8170,34 +8964,34 @@ "requêtes individuelles pour chaque primitive" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Fichiers 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 "Coordonnées importées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Phrases malformées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Erreurs de syntaxe : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Phrases inconnues : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Pas de coordonnées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Succès de l'import des trames NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Erreur lors de l'import des trames NMEA !" @@ -8208,9 +9002,9 @@ msgstr "préférence \"{0}\" manquante. Impossible d’initialiser 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 "Cette version de JOSM est incompatible avec le serveur défini." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8221,5 +9015,5 @@ "supporte que les versions {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}" @@ -8227,10 +9021,10 @@ "Communication établie avec {0} en utilisant le protocole de version {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 "format d’id inattendu reçu du serveur, reçu \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8240,33 +9034,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 "Ouverture de la révision..." -#: ../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 "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Ouverture de la révision..." + +#: ../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 "Ouverture de la révision..." + +#: ../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 "Fermeture de la révision..." -#: ../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 "Fermeture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../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 +msgstr "Attends 10 secondes… " + +#: ../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}." @@ -8294,29 +9146,33 @@ msgstr "Fichier bz2 invalide." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Mot de passe ou nom d’utilisateur incorrect." -#: ../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 "Attention : Le mot de passe est transféré non-crypté." -#: ../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 "Sauvegarder l’utilisateur et le mot de passe (non crypté)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Entrer le mot de passe" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Identifiant" -#: ../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 "URL de base du serveur OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Nom d'utilisateur (e-mail) du compte 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." @@ -8325,13 +9181,17 @@ "aucun mot de passe." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL du serveur de base" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "Nom d'utilisateur 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 "Mot de passe 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." @@ -8343,20 +9203,20 @@ "encodé dans l'URL.
N'utilisez pas un mot de passe de valeur." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Fichiers du serveur OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8364,6 +9224,8 @@ "html>" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +"Une erreur est survenue lors du chargement d'une sauvegarde." +"
L'erreur est :
{0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8576,35 +9438,46 @@ "Internet." -#: ../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} restant(s). Chargement de {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} restant(s). Chargement de {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} restant(s). Chargement de {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 "Rien à envoyer. Obtenez d’abord des données." + +#: ../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 "Mise à jour des greffons" -#: ../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 "Télécharger les greffons" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8617,5 +9490,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." @@ -8624,23 +9497,23 @@ msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer 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 "Téléchargement du greffon {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Annuler le téléchargement" -#: ../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 "Version {0} de JOSM requise pour le greffon {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Télécharger le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Annuler le téléchargement" @@ -8651,30 +9524,30 @@ msgstr "Une erreur est survenue dans le greffon {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 "Le greffon {0} nécessite la mise à jour de JOSM vers la version {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 "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." -#: ../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 "Greffon non trouvé : {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 "La dernière mise à jour du greffon date de plus de {0} jours." -#: ../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 " @@ -8685,21 +9558,21 @@ "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 "Désactiver le greffon" -#: ../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 "Impossible de charger le greffon {0}. Le supprimer des préférences ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Garder le greffon" -#: ../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 " @@ -8709,5 +9582,5 @@ "l’autorisation de remplacer les greffons existants." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8716,10 +9589,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../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 "D’après les informations du greffon, l’auteur est {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." @@ -8728,9 +9601,9 @@ "d'extension avant de rapporter un bug." -#: ../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 "Ce module d'extension doit-il être désactivé ?" -#: ../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 " @@ -8740,13 +9613,14 @@ "greffon ne soit plus chargé." -#: ../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 +"Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +msgstr "Informations sur le greffon" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -8757,5 +9631,5 @@ msgstr "Plus de détails" -#: ../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" @@ -8764,18 +9638,18 @@ msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Pas d'information sur les greffons trouvée." -#: ../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 "Le plugin {0} n'est pas disponible. Mise à jour annulée." -#: ../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 "Tous les greffons installés sont à jour." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8788,9 +9662,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 "Télécharger les greffons manquants" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8803,35 +9677,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}: Version {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 "Greffon intégré à 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 "Erreur à la lecture du fichier d’information du greffon : {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 "Ceci est après la fin de l’enregistrement" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Erreur lors de la lecture du son" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Ne rien faire" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Signaler une erreur" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8846,14 +9720,14 @@ "rapport d'erreur." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Exception inattendue" -#: ../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 "Veuillez rapporter un billet à {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 "" @@ -8861,5 +9735,5 @@ "que possible) !" -#: ../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 " @@ -8869,13 +9743,13 @@ "rapporter un bogue." -#: ../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 "Soyez sûr(e) d'inclure l'information suivante :" -#: ../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 "(Ce texte a déjà été copié dans votre presse-papier.)" -#: ../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}." @@ -8884,6 +9758,6 @@ "{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 "" @@ -8892,5 +9766,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8899,5 +9773,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8910,5 +9784,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" @@ -8918,5 +9792,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8927,22 +9801,57 @@ "\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 "" "(Astuce : Vous pouvez modifier les raccourcis-clavier dans les préférences.)" -#: ../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 "" @@ -8971,9 +9880,27 @@ msgstr "Créer un reseau de voies" -#: ../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 "Envoyer la trace" -#: ../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 @@ -8981,27 +9908,40 @@ msgstr "Charger les traces" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Public" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Cette sélection rend votre trace publique dans 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 "Description" -#: ../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 "Veuillez saisir une description de votre trace." -#: ../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 "Veuillez entrer des mot-clés liés à votre trace." -#: ../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}" @@ -9009,47 +9949,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 "Connexion..." -#: ../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 "Envoi annulé" -#: ../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 "Erreur lors du chargement" -#: ../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 "Succès de l'envoi de la trace 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 "L'envoi a échoué. Le serveur a retourné le message suivant : " -#: ../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 "Envoyer la trace GPX : {0}% ({1} ou {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 "Pas de description fournie. Merci de fournir une description." -#: ../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 "Pas de calque GPX sélectionné. Impossible de téléverser une trace." -#: ../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 "Pas de nom d'utilisateur fourni." -#: ../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 "Pas de mot de passe fourni." -#: ../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 "Envoyer la trace GPX" @@ -9162,19 +10102,19 @@ msgstr "Charger l'ensemble des images comme un nouveau calque." -#: ../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 "Fichiers 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 "Le fichier {0} est maintenant chargé sous le nom \"{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 "Erreur pendant le traitement {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." @@ -9186,34 +10126,34 @@ "hpoto et sélectionnez un fuseau horaire.
" -#: ../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 "Heure de la photo (information 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 "Heure du GPS (lu sur la photo) : " -#: ../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 " [jj/mm/aaa hh:mm:ss]" -#: ../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 "Je suis dans le fuseau horaire de : " -#: ../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 "Aucune date" -#: ../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 "Ouvrez une autre photo" -#: ../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 "Synchroniser l’heure avec une photo du 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" @@ -9223,29 +10163,29 @@ "Merci d’utiliser le format demandé" -#: ../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 "Date non valide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 "Trace 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 "Ouvrir une autre trace 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 "Fuseau horaire : " -#: ../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 "Décallage :" -#: ../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 "" @@ -9253,41 +10193,41 @@ "html>" -#: ../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 "Mettre à jour la position pour : " -#: ../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 "Toutes les images" -#: ../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 "Images sans position 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 "Images non encore étiquetées" -#: ../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 "Correler les images avec la trace 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 "Corréler" -#: ../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 "Estimation automatique" -#: ../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 "Vous devez sélectionner une trace 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 "Aucune trace GPX sélectionnée" -#: ../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 "" @@ -9298,9 +10238,9 @@ "Format attendu : {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 "Fuseau horaire invalide" -#: ../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 "" @@ -9311,27 +10251,27 @@ "Format attendu : {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 "Décallage invalide" -#: ../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 "Trouvé {0} correspondances sur {1} dans la trace 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 "Trace GPX chargée" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693 +msgid "The selected photos don't contain time information." +msgstr "" +"Les photos sélectionnées ne contiennent pas d'information d'horodatage." + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 -msgid "The selected photos don't contain time information." -msgstr "" -"Les photos sélectionnées ne contiennent pas d'information d'horodatage." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Les photos ne contienne tpas d'information d'horodatage" -#: ../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." @@ -9340,39 +10280,39 @@ "autre." -#: ../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 "La trace GPX n'a pas d'horodatage." -#: ../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 "Fuseau horaire : {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 "Minutes : {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 "Secondes : {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} photo(s) sur {1} correspond(ent) à la trace 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 "(Différence de temps de {0} jours)" -#: ../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 "Différence entre la trace et les photos : {0}min. {1}sec." -#: ../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 " @@ -9383,13 +10323,13 @@ "manuellement." -#: ../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 "La correspondance des photos avec la trace a échoué" -#: ../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 "Ajuster le fuseau horaire et le décalage" -#: ../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 "Valeurs par défaut" @@ -9410,5 +10350,5 @@ msgstr "Erreur sur le fichier {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9417,16 +10357,18 @@ "(No = new cache)" msgstr "" +"Le lieu \"{0}\" a été trouvé dans le cache.\n" +"Charger le cache d'abord ?\n" +"(Non = nouveau cache)" #. this below is a temporary workaround to fix the "always on top" issue #. 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 "Tout sélectionner" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +msgstr "Sélectionner la feuille cadastrale." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -9455,8 +10397,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 "" "Ville {0} non trouvée ou non disponible sur le WMS.\n" @@ -9467,21 +10409,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 "Sélectionner la commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Choisir parmi..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../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" @@ -9495,37 +10437,50 @@ "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Restaurer la fontion de téléchargement à la touche F11" -#: ../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 "JOSM est arreté pour que la modification prenne effet." -#: ../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 "" +"Attention : la boîte de dialogue des options n'a pu être affichée au premier " +"plan. L'exception était : {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Remplacer le fond original par la couleur de fond de 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 "Inverser les couleurs grises (pour les fonds noir)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Rendre le fond transparent." -#: ../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 "Tracer les limites des données téléchargées." -#: ../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 "Activer le tampon automatique." -#: ../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 "Taille max. du tampon (en MB)" -#: ../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." @@ -9542,9 +10497,9 @@ "
avant tout chargement de données créé à partir de ce greffon." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS du cadastre français" -#: ../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 "" @@ -9552,10 +10507,10 @@ "celle-ci est activé" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Source" -#: ../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 " @@ -9565,5 +10520,5 @@ "préférences de 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). " @@ -9573,9 +10528,9 @@ "intermédiaires). Utile pour lire les textes sur fond noir." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Permet l'empilement de plusieurs calques" -#: ../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 "" @@ -9583,5 +10538,5 @@ "gauche." -#: ../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 "" @@ -9589,11 +10544,10 @@ #. 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 "Division du téléchargement de zone :" - -#: ../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 "" @@ -9601,18 +10555,17 @@ "mémoire)" -#: ../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 "Carré de taille fixe (par défaut : 100m)" -#: ../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 "Taille fixe (de 25 à 1000 mètres)" -#: ../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 "Division du téléchargement de zone :" - -#: ../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 "" @@ -9672,12 +10625,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contact du serveur WMS..." +msgstr "Contact du serveur WMS du cadastre…" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "image non chargée" +msgstr "L'image a déjà été chargée." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9711,20 +10662,23 @@ #: ../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 +#, fuzzy 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 "" +"Pour activer le greffon WMS du cadastre, changez\n" +"la projection actuelle vers une du cadastre et réessayez." + +#: ../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 +msgstr "Géoréférencement interrompu." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 msgid "" "Click first corner for image cropping\n" @@ -9732,9 +10686,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 "chargement de l’image..." + +#: ../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" @@ -9742,31 +10702,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 -#, fuzzy +#: ../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 "Entrez la Lat./Long. pour vous rendre à la position." - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149 +msgstr "Entrez la position est,nord du cadastre." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 msgid "East" msgstr "Est" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 msgid "North" msgstr "Nord" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Set Lambert coordinate" -msgstr "Conserver leurs coordonnées" +msgid "Set " +msgstr "Sélectionner" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9833,6 +10801,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)" @@ -9856,6 +10824,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 "Calque vide" @@ -9871,7 +10839,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Centre de la trame : {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10404,6 +11372,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 "eau" @@ -10416,8 +11384,4 @@ msgid "land" msgstr "terre" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "rien" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10719,9 +11683,9 @@ msgstr "Boucle de téléchargement 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 "Afficher les problèmes d'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 " @@ -10733,5 +11697,5 @@ "passer au nouveau serveur ? (fortement recommandé)" -#: ../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 "Basculer vers le nouveau serveur openstreetbugs ?" @@ -11212,4 +12176,6 @@ "found." msgstr "" +"Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été " +"trouvés." #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -11312,5 +12278,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 "Nom de la rue" @@ -11329,29 +12295,29 @@ msgstr "Afficher la liste des auteurs" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Ouvrir la page utilisateur" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Ouvrir la page utilisateur dans le navigateur" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Sélectionner les données de l'utilisateur" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Remplacer la sélection par les données utilisateurs" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Veuillez sélectionner quelques données" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes" @@ -11365,25 +12331,15 @@ msgstr "Joint les zones qui se superposent l'une l'autre" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de " -"charger." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Continuer tout de même" - -#: ../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 "Seul un maximum de deux zones peuvent être jointes pour le moment." -#: ../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}\" n'est pas fermé et ne peut donc être joint." -#: ../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" @@ -11396,39 +12352,39 @@ "Voulez-vous vraiment continuer ?" -#: ../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 "Veuillez abandonner si vous n'êtes pas sûr(e)" -#: ../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 "Veuillez sélectionner au moins un chemin clos devant être fusionné." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Pas d’intersection trouvée. Rien n’a été modifié." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Noeuds ajoutés sur toutes les intersections" -#: ../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 "" "Supprimer les chemins qui ne font pas partie d'un multipolygone intérieur" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Corriger les relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Ai fusionné une aire superposée sur elle même" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Ai fusionné des aires superposées" -#: ../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 " @@ -11438,83 +12394,83 @@ "Veuillez vérifier qu'aucune erreur n'a été introduite." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Corriger les conflits d'étiquettes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Élément supprimé des relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Aires jointes: enlever les voies courtes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Chemin fermé" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Supprime les étiquettes des chemins internes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Fonction de jointure des zones" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Aller à la position" -#: ../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 "" "Ouvre une boite de dialogue permettant de se rendre à une position spécifique" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Entrez la Lat./Long. pour vous rendre à la position." -#: ../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 "Vous pouvez aussi coller une URL de www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (en mètres)" -#: ../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 "Aller ici" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Aller à la position" -#: ../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 "" "Impossible d'analyser la Latitude, Longitude ou le Zoom. Veuillez vérifier." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Analyse syntaxique de la Lat./Lon. impossible" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Simplifier le chemin" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Supprimer les nœuds non nécessaires du chemin" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Veuillez sélectionner au moins un chemin à simplifier." -#: ../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?" @@ -11526,25 +12482,25 @@ "La sélection contient {0} chemins. Êtes-vous sûr de vouloir les simplifier ?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Êtes-vous sur ?" -#: ../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 "Erreurs de validation" -#: ../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 "Aucune erreur de validation" -#: ../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 "Grille" -#: ../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 "" @@ -11637,53 +12593,53 @@ msgstr "Validation des données" -#: ../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 "Les données contiennent des erreurs. Envoyer quand même ?" -#: ../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 "Ouvrir la fenêtre de validation." -#: ../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 "Zoomer sur le problème" -#: ../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 "Réparer" -#: ../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 "Résoudre l'erreur sélectionné" -#: ../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 "Ignorer" -#: ../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 "Ignorer les erreurs sélectionnées à l'avenir." -#: ../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 "Groupe complet" -#: ../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 "Eléments seuls" -#: ../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 "Rien" -#: ../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 "Ignorer le groupe complet ou les éléments individuels ?" -#: ../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 "Ignore les éléments" -#: ../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" @@ -11707,24 +12663,58 @@ #: ../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 "" "Ce test vérifie si deux routes, chemins de fer ou voies d’eau se croisent " "sur le même calque sans être connectés par un nœud." -#: ../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 "Créer les bêtiments" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Chemins se croisant" -#: ../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 "Nœuds dupliqués" -#: ../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 "" "Ce test vérifie si des nœuds ne sont pas exactement à la même position." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Nœuds avec le même nom." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Confirmation" + +#: ../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 "Chemin dupliqué" + +#: ../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 "" +"Ce test vérifie si des nœuds ne sont pas exactement à la même position." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Créer un chemin dupliqué" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11814,23 +12804,23 @@ "mal ortographiés." -#: ../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 "Vérificateur de propriétés :" -#: ../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 "Ce greffon vérifie les erreurs dans les clés et les valeurs." -#: ../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 "Ligne du vérificateur d’étiquettes invalide - {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 "Erreur d’orthographe ligne : {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 "" @@ -11841,7 +12831,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 "Combinaisons étiquette/valeur non valide" @@ -11849,83 +12839,83 @@ #. 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 "Problème de rendu" -#: ../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 "Clé \"{0}\" non valide." -#: ../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 "Étiquettes avec des valeurs vides" -#: ../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 "Clé de propriété invalide" -#: ../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 "espace blanc dans une clé non valide" -#: ../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 "Les valeurs commencent ou finissent par un espace blanc" -#: ../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 "Les valeurs contiennent du code 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 "La clé \"{0}\" ne fait pas partie des balises prédéfinies." -#: ../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 "Les balises ne contiennent pas de propriété" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" +"La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies." + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" -"La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies." - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Les balises ne contiennent pas de valeur de propriété" -#: ../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 "Vérifier les clés de propriétés." -#: ../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 "" "Valider que les clés sont valides en comparasion avec une liste de mots?" -#: ../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 "Utiliser un vérificateur de propriétés complexe." -#: ../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 "" "Valider les étiquettes et les valeurs en utilisant des règles complexes." +#: ../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 "Source de 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." @@ -11936,21 +12926,21 @@ "données de vérification des étiquettes." -#: ../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 "Ajouter une nouvelle source à la liste." -#: ../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 "Modifier la source sélectionnée." -#: ../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 "Sources de données" -#: ../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 "Vérifier les valeurs des propriétés" -#: ../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 "" @@ -11958,9 +12948,9 @@ "prédéfinies." -#: ../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 "Vérifier les 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 "" @@ -11968,54 +12958,54 @@ "étiquette." -#: ../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 "Vérifier les notes de rendu." -#: ../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 "Vérifier si le rendu de carte a généré des erreurs." -#: ../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 "Utiliser le fichier de données par défaut." -#: ../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 "Utiliser le fichier de données par défaut (recommandé)." +#: ../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 "Utiliser la vérification orthographique par défaut." -#: ../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 "Utiliser le fichier de vérification d’orthographe (recommandé)." -#: ../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 "Corriger les propriétés" -#: ../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 "Impossible de trouver le type element" -#: ../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 "Impossible de trouver le niveau d’avertissement" -#: ../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 "Expression interdite \"{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}''" @@ -12160,7 +13150,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 "bâtiment" @@ -12174,5 +13164,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 "zone" @@ -12232,5 +13222,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "carrefour sans nom" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -12276,5 +13266,5 @@ #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 msgid "Scanned Map..." -msgstr "" +msgstr "Carte scannée…" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 @@ -12282,4 +13272,5 @@ "Display a map that was previously scanned and uploaded to walking-papers.org" msgstr "" +"Afficher une carte précédemment scannée et envoyée sur walking-papers.org" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 @@ -12287,4 +13278,6 @@ "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" msgstr "" +"Saisir une URL walking-papers.org ou un identifiant (la valeur après le ?id= " +"dans l'URL)" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 @@ -12292,9 +13285,10 @@ msgid "Could not read information from walking-papers.org the id \"{0}\"" msgstr "" +"Impossible de lire l'information depuis walking-papers.org pour l'id \"{0}\"" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 #, java-format msgid "Walking Papers: {0}" -msgstr "" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -12314,5 +13308,5 @@ msgstr "Intersection atteinte" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Une exception s’est produite" @@ -12380,14 +13374,14 @@ msgstr "Aide sur le greffon 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 "Rectifier l'image..." -#: ../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 "Télécharge des images rectifiées depuis différents services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12398,26 +13392,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 "Lien WMS Personalisé" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Services de rectification supportés :" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Visiter la page d'accueil" -#: ../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 "URL WMS ou i d’image :" -#: ../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 "Ajouter l'Image rectifiée" -#: ../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 " @@ -12427,37 +13421,55 @@ "Veuillez réessayer." -#: ../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 "Pas d’URL WMS valide ou d’id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Ajuster 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 "Ajuster la position du calque WMS sélectionné" -#: ../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 +msgstr "Veuillez sélectionner le calque WMS à ajuster." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +msgstr "Sélectionnez le calque WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" -msgstr "" +msgstr "Commencer à ajuster" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgid "There are currently no WMS layer to adjust." +msgstr "Il n'y a actuellement pas de calque WMS à ajuster." #: ../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 +msgstr "Pas de calque à ajuster." + +#: ../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 "" @@ -12472,15 +13484,43 @@ msgstr "Téléchargement automatique" -#: ../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 "désigné" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {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 "Calque WMS ({0}), téléchargement au zoom {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 "Date non valide" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12489,37 +13529,37 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Charger la couche 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}" @@ -12528,54 +13568,66 @@ "attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../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 "Ouvrir un calque WMS vide pour charger des données depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Préférences du greffon 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 "" "Modifier la liste des serveurs WMS affichée dans le menu du greffon 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 "Nom du menu" -#: ../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 "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Nom du menu (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "URL de WMS (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Entrer un nom pour le menu et un URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Copier défaut" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Copier les valeurs par défaut" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Veuillez sélectionner au moins un chemin." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" -msgstr "" +msgstr "Outil de téléchargement :" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "fichiers TCX (*.tcx)" #. * @@ -12806,4 +13858,7 @@ "defined in routes.xml file in plugin directory" msgstr "" +"Permet de faire un rendu des routes (bus, chemins de randonnées, itinéraires " +"cyclables…). Les types de routes doivent être défini dans le fichier routes." +"xml, dans le dossier du greffon." #. Plugin routing @@ -12990,62 +14045,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 "Référence" - -#. 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 "Calque" #. item "Streets/Motorway" combo "Layer" @@ -13060,5 +14060,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 "Voies" @@ -13073,5 +14073,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" @@ -13081,10 +14080,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 "Vitesse max (km/h)" @@ -13128,9 +14127,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 "Sens unique" @@ -13178,13 +14177,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 "Pont" @@ -13226,13 +14225,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 "Tunnel" @@ -13272,12 +14271,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 "Découpe" @@ -13317,12 +14316,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 "Remblai" @@ -13478,17 +14477,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 "Largeur (mètres)" @@ -13515,4 +14514,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" @@ -13531,11 +14531,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 "Revêtement" @@ -13545,4 +14546,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" @@ -13557,9 +14559,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 "avec revêtement" @@ -13567,10 +14570,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 "sans revêtement" + +#: 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 "Châlet" + +#: 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 "béton" + +#: 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 "Location" + +#. 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 "bois" + +#: 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 "parking_tickets" #. item "Ways/Track Grade 2" combo "Surface" @@ -13578,12 +14644,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 "pavés" + +#: 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 "gravier" + +#: 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 "pavés" + +#: 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 "incomplet" + +#: 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 "herbe" + +#: 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 "herbe" + +#: 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 "sable" + +#. 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 "terre" #. item "Streets/Residential" text "Width (meters)" @@ -13664,20 +14812,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Rue à accès restreint" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Éditer les restrictions d’une route" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Péage" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Sans issue (cul-de-sac)" @@ -13690,8 +14838,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 "Accès" @@ -13726,32 +14874,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 "oui" @@ -13764,40 +14927,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 "privé" -#: 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 "désigné" @@ -13810,19 +14973,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 "destination" @@ -13845,65 +15008,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 "permis par le propriétaire" -#: 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 "véhicules agricoles" -#: 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 "non" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Biens" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Poids-lourds" @@ -13918,10 +15086,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 "Cheval" @@ -13937,17 +15105,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 "Motos" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13959,30 +15126,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 "Voitures" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Véhicules de service public" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Bateaux à moteur" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Bateaux" #. 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 "Vitesse min (km/h)" @@ -13990,25 +15157,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 "Poids max (tonnes)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Hauteur max. (mètres)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Largeur max. (mètres)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Longueur max. (mètres)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rond-point" @@ -14019,5 +15186,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 "Éditer une jonction" @@ -14033,5 +15200,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" #. @@ -14039,9 +15206,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 "Type" @@ -14061,10 +15228,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 "motorway" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorway_link" @@ -14086,10 +15253,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 "voie rapide" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "trunk_link" @@ -14111,10 +15278,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 "primary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "primary_link" @@ -14136,5 +15303,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" @@ -14149,9 +15316,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "tertiary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "unclassified" @@ -14165,9 +15332,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "residential" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "living_street" @@ -14197,10 +15364,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 "service" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "bus_guideway" @@ -14230,6 +15397,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 "construction" @@ -14240,10 +15407,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 "Éditer un pont" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Modifier un tunnel" @@ -14251,19 +15418,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Chemins" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Construction" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Éditer une route en construction" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Jonction" @@ -14279,5 +15446,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "roundabout" @@ -14286,5 +15453,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Chemin équestre" @@ -14292,5 +15459,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Éditer un chemin équestre" @@ -14298,5 +15465,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Voie cyclable" @@ -14306,11 +15473,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 "Éditer une voie cyclable" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Rue Piétonne" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Voie piétonnière" @@ -14319,11 +15492,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Éditer un chemin pour piétons" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pointes" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Rue Piétonne" @@ -14332,5 +15511,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Éditer une rue piétonne" @@ -14338,5 +15517,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Escaliers" @@ -14346,5 +15525,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 "Éditer des escaliers" @@ -14353,5 +15532,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Piste" @@ -14360,39 +15539,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Éditer une route carrossable sans revêtement" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "béton" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "gravier" - -#. 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 "terre" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "herbe" - -#: 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 "sable" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Piste grade 1" @@ -14401,5 +15552,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Éditer une piste grade 1" @@ -14407,5 +15558,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Piste grade 2" @@ -14414,5 +15565,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Éditer une piste grade 2" @@ -14420,5 +15571,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Piste grade 3" @@ -14427,5 +15578,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Éditer une piste grade 3" @@ -14433,5 +15584,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Piste grade 4" @@ -14440,5 +15591,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Éditer une piste grade 4" @@ -14446,5 +15597,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Piste grade 5" @@ -14453,5 +15604,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Éditer une piste grade 5" @@ -14460,5 +15611,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Chemin partagé" @@ -14467,19 +15618,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Editer le chemin" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Motoneige" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. 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 "Chemin de randonnée" @@ -14489,5 +15643,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 "Éditer un chemin de randonnée" @@ -14495,5 +15649,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Chemin de randonnée en montagne" @@ -14503,5 +15657,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 "Éditer un chemin de randonnée en montagne" @@ -14509,5 +15663,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Chemin de randonnée en montagne exigeant" @@ -14517,5 +15671,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 "Éditer un chemin de randonnée en montagne exigeant" @@ -14523,5 +15677,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Chemin de randonnée alpin" @@ -14531,5 +15685,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 "Éditer un chemin de randonnée alpin" @@ -14537,5 +15691,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Chemin de randonnée alpin exigeant" @@ -14545,5 +15699,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 "Éditer un chemin de randonnée alpin exigeant" @@ -14551,5 +15705,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Chemin de randonnée alpin difficile" @@ -14559,5 +15713,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 "Éditer un chemin de randonnée alpin difficile" @@ -14565,10 +15719,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Balises" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Jonction autoroutière" @@ -14576,15 +15730,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Éditer une jonction autoroutière" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Numéro" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Aire de repos" @@ -14592,5 +15746,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Éditer une aire de repos" @@ -14604,4 +15758,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" #. @@ -14621,18 +15777,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 "Compagnie" @@ -14641,5 +15799,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Feux tricolores" @@ -14649,5 +15807,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Passage piéton" @@ -14656,27 +15814,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 "non contrôlé" -#: 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 "feux tricolores" -#: 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 "île" -#: 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 "unmarked" #. 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 "Traversée à cheval" @@ -14684,6 +15842,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 "Traversée à vélo" @@ -14692,11 +15850,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 "Aide à la traversée (personne)" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Nom du tpe de passage (UK)" @@ -14704,30 +15862,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 "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pélican" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pégase" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tigre" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stop" @@ -14735,5 +15893,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Passage piéton" @@ -14742,14 +15900,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Modifier passage piéton sur voie ferrée" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Type de nom (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rond-point" @@ -14760,14 +15918,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 "Direction" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "sens horaire" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Petit élargissement pour demi-tour" @@ -14777,20 +15935,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 "Limite de ville" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Éditer un signe de limite de ville" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Nom secondaire" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Radar automatique" @@ -14798,5 +15956,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Téléphone d'urgence" @@ -14804,5 +15962,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Descente dangereuse" @@ -14810,5 +15968,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Descente très dangereuse" @@ -14817,10 +15975,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Gué" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Modifier un gué" @@ -14828,5 +15986,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Col de montagne" @@ -14834,5 +15992,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Éditer un col de montagne" @@ -14840,11 +15998,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 "Altitude" @@ -14852,5 +16010,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barrières" @@ -14858,5 +16016,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Plot" @@ -14864,5 +16022,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Modifier une bitte d'amarrage" @@ -14907,16 +16065,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 "Trafic autorisé:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Barrière pour cycles" @@ -14925,5 +16083,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Ruines" @@ -14931,5 +16089,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Grille dans le sol" @@ -14937,10 +16095,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Modifier une grille dans le sol" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Entrée de voie de bus (Allemagne)" @@ -14948,15 +16106,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pointes" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Modifier pointes" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Péage" @@ -14964,5 +16122,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Éditer un péage" @@ -14970,10 +16128,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Douane" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Modifier douane" @@ -14983,5 +16141,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Haie" @@ -14990,5 +16148,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Barrière" @@ -14997,5 +16155,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mur" @@ -15003,5 +16161,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Rempart" @@ -15010,5 +16168,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Mur de soutènement" @@ -15020,15 +16178,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Entrée" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Editez une entrée" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Porte" @@ -15036,50 +16194,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Editer une porte" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Barrière" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Modifier une barrière" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Porte de clôture" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Modifier une Porte de clôture" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Barrière mobile" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Modifier une barrière mobile" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Portillon à chicane" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Modifier un Portillon à chicane" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Échalier" @@ -15087,25 +16245,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Modifier un échalier" #. 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 "Écluse" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Modifier une écluse" @@ -15116,10 +16274,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 "Eau" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Source" @@ -15127,5 +16285,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Éditer une source" @@ -15133,5 +16291,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Canal d’évacuation" @@ -15139,10 +16297,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Éditer un canal d’évacuation" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Ruisseau" @@ -15150,10 +16308,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Éditer un ruisseau" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Canal" @@ -15161,10 +16319,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Éditer un canal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Rivière" @@ -15174,5 +16332,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 "Éditer une rivière" @@ -15180,15 +16338,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Éditer de l’eau" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Terre" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Editez un terrain" @@ -15196,15 +16354,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Bassin" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Éditer un bassin" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Bassin de retenue" @@ -15212,15 +16370,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Éditer un bassin de retenue" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Réservoir couvert" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Éditer un réservoir couvert" @@ -15228,5 +16386,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Lit de rivière" @@ -15235,10 +16393,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Modifier lit de rivière" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Zone inondable" @@ -15249,14 +16407,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 "Modifier zone inondable" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "marécages" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "tourbière" @@ -15270,35 +16428,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "marais" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "roselière" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "marais salant" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "étendue vaseuse" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangrove" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Terrain boueux/vase" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Éditer un terrain boueux" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Plage" @@ -15306,20 +16464,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Éditer une plage" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Baie" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Éditer une baie" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Falaise" @@ -15327,10 +16485,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Éditer une falaise" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Ligne côtière" @@ -15338,5 +16496,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Éditer une ligne côtière" @@ -15344,5 +16502,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Itinéraire de ferry" @@ -15350,5 +16508,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Éditer un itinéraire de ferry" @@ -15357,5 +16515,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Chantier naval" @@ -15363,10 +16521,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Éditer un chantier naval" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dock" @@ -15374,5 +16532,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Éditer un dock" @@ -15380,5 +16538,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Barrage" @@ -15386,15 +16544,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Éditer un barrage" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Voie navigable" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Écluse" @@ -15403,5 +16561,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Petit barrage" @@ -15409,20 +16567,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Éditer une écluse" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Cascade" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Éditer une cascade" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Point de retournement" @@ -15431,15 +16589,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Éditer une marina" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Jetée/Ponton" @@ -15447,10 +16605,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Modifier jetée/ponton" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Terminal de Ferry" @@ -15458,10 +16616,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Editer un terminal de Ferry" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Slipway" @@ -15471,5 +16629,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 "Éditer un plan incliné" @@ -15477,10 +16635,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Voie ferrée" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Rail" @@ -15488,5 +16646,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Éditer des rails" @@ -15516,8 +16674,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 "Types optionels" @@ -15531,35 +16689,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 "triage" -#: 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 "voie de garage" -#: 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 "embranchement" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Voie ferrée étroite" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Éditer une voie ferrée étroite" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15567,45 +16725,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Éditer un monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Préservé" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Éditer une voie ferrée touristique" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Rails légers" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Éditer des rails légers" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Voie souterraine" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Éditer un métro" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tram" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Éditer un tram" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Voie de guidage de bus" @@ -15613,5 +16771,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Éditer une voie de guidage de bus" @@ -15620,14 +16778,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Voie désaffectée" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Éditer une voie désaffectée" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Voie abandonnée" @@ -15636,5 +16794,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Passage à niveau" @@ -15643,5 +16801,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Passage piéton sur voie ferrée" @@ -15651,5 +16809,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Type de passage" @@ -15657,5 +16815,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Plaque tournante" @@ -15664,10 +16822,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Transports aériens par câble" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Télésiège" @@ -15675,10 +16833,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Éditer un télésiège" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Téléski" @@ -15686,10 +16844,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Éditer un téléski" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Télécabine" @@ -15697,10 +16855,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Éditer un télécabine" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Oeufs" @@ -15708,5 +16866,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Modifier Oeufs" @@ -15714,5 +16872,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 "Station" @@ -15723,10 +16881,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 "Éditer la station" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Station service" @@ -15736,9 +16894,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 "Modifier station essence" #. 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 "Horaires d’ouverture" + +#. 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" @@ -15758,106 +17145,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Éditer un parking" #. 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 "Numéro de référence" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "parking (bâtiment)" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "surface" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "souterrain" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Automobiles en libre service" + +#. 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 "Péage/Forfait" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Capacité" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Espaces pour handicapés" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Espaces pour handicapés" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Espaces pour handicapés" + +#: 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 "Lavage" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Editez un espace de lavage de voitures" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Concession/Réparation" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Éditer une concession/réparation" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Réparer" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Editez un garagiste" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Location" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Éditer une location de voiture" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Partage" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Éditer un covoiturage" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Éditer un parking à vélo" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Capacité" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "surface" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "parking (bâtiment)" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "souterrain" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "Automobiles en libre service" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Espaces pour handicapés" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Péage/Forfait" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Lavage" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Editez un espace de lavage de voitures" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Concession/Réparation" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Éditer une concession/réparation" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Réparer" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Editez un garagiste" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Location" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Éditer une location de voiture" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Partage" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Éditer un covoiturage" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Éditer un parking à vélo" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Éditer une location de vélos" @@ -15866,15 +17288,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Éditer un magasin de vélo" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transport public" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Référence UIC" @@ -15882,5 +17304,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Halte ferroviaire" @@ -15888,5 +17310,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Editez un arrêt" @@ -15894,5 +17316,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Arrêt de tram" @@ -15901,5 +17323,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Éditer un arrêt de tram" @@ -15907,5 +17329,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Quai" @@ -15914,5 +17336,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Éditer un quai" @@ -15924,5 +17346,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 "Référence (numéro de voie)" @@ -15930,10 +17352,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 "Surface" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Bouche de métro" @@ -15942,10 +17364,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Éditer une bouche de métro" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Chaise roulante" @@ -15954,5 +17376,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Gare routière" @@ -15961,5 +17383,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Éditer une gare routière" @@ -15967,5 +17389,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Arrêt de bus" @@ -15975,5 +17397,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 "Éditer un arrêt de bus" @@ -15982,8 +17404,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 "Abri" @@ -15991,10 +17411,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Plateforme de bus" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Éditer une plateforme de bus" @@ -16002,5 +17422,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -16008,5 +17428,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Editez une station de taxi" @@ -16014,5 +17434,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Aéroport" @@ -16020,15 +17440,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Modifier aéroport" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -16037,5 +17457,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Hôtel" @@ -16047,5 +17467,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hôtel" @@ -16054,15 +17474,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Éditer un hôtel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Étoiles" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Môtel" @@ -16070,20 +17490,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Éditer un motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Chambre d’hôte" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Éditer une chambre d’hôte" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Châlet" @@ -16091,10 +17511,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Editez un châlet" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Hôtel" @@ -16102,30 +17522,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Éditer une auberge de jeunesse" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Chalet" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Modifier chalet" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Site pour caravane" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Éditer un site pour caravane" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Camping" @@ -16133,10 +17553,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Éditer un camping" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Nourriture & boissons" @@ -16147,5 +17567,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -16153,5 +17573,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Éditer un restaurant" @@ -16159,5 +17579,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 "Cuisine" @@ -16165,61 +17585,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 "italien" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chinois" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "greque" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "allemand" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indien" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "régional" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turque" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatique" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thaïlandais" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexicain" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japonais" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fast Food" @@ -16227,9 +17647,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Éditer un fast food" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Café" @@ -16237,10 +17657,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Editez un café" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Bar" @@ -16248,20 +17667,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Éditer un biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16269,10 +17686,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Modifier Bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Boîte de nuit" @@ -16280,33 +17696,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Éditer une boîte de nuit" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Tourisme" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attraction" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Editez une attraction" -#. 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 "Horaires d’ouverture" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Musée" @@ -16314,10 +17721,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Éditer un musée" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16326,10 +17732,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Editez un Zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Point de vue" @@ -16337,25 +17742,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Éditer un point de vue" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Tour de surveillance" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Parc d’attraction" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Éditer un parc d’attraction" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Oeuvre d’art" @@ -16363,5 +17767,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Éditer une oeuvre d’art" @@ -16369,86 +17773,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Office du Tourisme" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Modifier Office du Tourisme" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Carte" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Type de carte" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "carte" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "carte de la ville" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "carte de randonnée" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "carte de randonnée cycliste" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "rue" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chinois" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Télécharger zone" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Coller" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Ville de plus de 100 000 habitants" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "régional" #. 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 "Description détaillée" #. 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 "Cyclisme" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Chemin de randonnée en montagne" + +#. 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 "Ski" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "voie de garage" + +#. 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 "Bureau d'informations" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Type de bureau" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "tableau" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Douane" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "verte" + +#: build/trans_presets.java:1737 msgid "history" msgstr "histoire" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "nature" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "faune" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "utilisation du terrain" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Panneau de direction (randonnée)" -#. 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 "Information" + +#. 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 "Description détaillée" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Numéro de téléphone" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Autre points d'information" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Éditer un abri" @@ -16456,25 +17985,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 "Âtre" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Site de pique-nique" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Éditer un site de pique-nique" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Patrimoine" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Château" @@ -16483,20 +18012,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Éditer un château" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruines" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Éditer des ruines" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Site archéologique" @@ -16505,10 +18033,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Éditer un site archéologique" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Lieu de bataille" @@ -16516,5 +18043,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Éditer un lieu de bataille" @@ -16522,15 +18049,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument commémoratif" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Editez un monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Mémorial" @@ -16538,45 +18065,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Éditer un mémorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Croix" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Éditer une croix" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Chapelle" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Éditer une Chapelle" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Loisir" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Parc aquatique" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Éditer un parc aquatique" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Aire de jeux" @@ -16584,15 +18111,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Éditer une zone de jeu" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Pêche" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Éditer un lieu de pêche" @@ -16600,15 +18127,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sport" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stade" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Éditer un stade" @@ -16622,6 +18149,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 "Selectionner un sport:" @@ -17013,30 +18540,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 "sport" @@ -17046,227 +18573,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 "multi" -#: 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 "tir à l'arc" -#: 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 "athletics" -#: 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 "australian_football" -#: 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 "baseball" -#: 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 "basketball" -#: 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 "boules" -#: 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 "boules" -#: 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 "canoë" -#: 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 "climbing" -#: 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 "cricket" -#: 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 "cricket_nets" -#: 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 "croquet" -#: 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 "cycling" -#: 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 "dog_racing" -#: 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 "équitation" -#: 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 "football" -#: 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 "golf" -#: 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 "gymnastics" -#: 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 "hockey" -#: 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 "horse_racing" -#: 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 "moteur" -#: 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 "pelote" -#: 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 "racquet" -#: 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 "rugby" -#: 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 "chasse" -#: 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 "skateboard" -#: 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 "skate" -#: 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 "ski" -#: 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 "football" -#: 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 "swimming" -#: 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 "table_tennis" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Centre sportif" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Éditer un centre sportif" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Terrain de sport" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Éditer un terrain de sport" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Circuit" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Éditer un circuit" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Parcours de Golf" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Éditer un terrain de golf" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Éditer un minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Multi" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Editer Multi" @@ -17305,248 +18830,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 "Terrain" -#: 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 "sports_centre" -#: 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 "stadium" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Éditer un Bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Athlétisme" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Éditer athlétisme" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Tir à l’arc" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Éditer tir à l’arc" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Escalade" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Éditer escalade" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Canoë" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Éditer canoë" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Cyclisme" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Éditer cyclisme" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Course de chiens" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Éditer course de chiens" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Equitation" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Éditer sports équestres" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Course de chevaux" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Éditer course de chevaux" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastique" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Éditer gymnastique" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Sports mécaniques" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Éditer sports mécaniques" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skate" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Éditer patin à roulettes" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Éditer skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Natation" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Éditer natation" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Ski" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Type de piste" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "de descente" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "nordique" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snow park" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Difficulté" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "verte" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "bleue" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "intermédiaire" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "avancé" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "expert" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "jaune" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Tirer" @@ -17554,178 +19071,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Éditer tir sportif" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Sport de balle" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Football" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Éditer football" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Football" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Éditer football" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Football australien" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Éditer football australien" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Éditer baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Éditer basketball" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Editer un Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boules" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Éditer boules" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Boules" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Éditer bowls" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Éditer cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Filets de cricket" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Éditer filets de cricket" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Éditer croquet" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Éditer hockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelote" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Éditer pelote basque" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Sports de raquette" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Éditer sports de raquette" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Éditer rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Tennis de table" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Éditer tennis de table" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Éditer tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Bâtiments" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bâtiment" @@ -17733,5 +19250,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Bâtiment officiel" @@ -17739,10 +19256,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Éditer un bâtiment officiel" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Mairie" @@ -17750,10 +19267,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Éditer une mairie" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassade" @@ -17761,10 +19278,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Editer une ambassade" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Palais de justice" @@ -17773,10 +19290,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Éditer un palais de justice" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Prison" @@ -17785,10 +19302,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Éditer une prison" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Poste de police" @@ -17798,10 +19315,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 "Éditer un poste de police" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Caserne de pompiers" @@ -17810,10 +19327,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Éditer une caserne de pompiers" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Bureau de poste" @@ -17821,5 +19338,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Éditer un bureau de poste" @@ -17827,15 +19344,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Jardin d’enfants" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Éditer un jardin d’enfants" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "École" @@ -17843,10 +19360,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Éditer une école" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Université" @@ -17854,10 +19371,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Éditer une université" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Établissement d’enseignement supérieur" @@ -17865,5 +19382,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Éditer un établissement d’enseignement supérieur" @@ -17871,5 +19388,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Cinema" @@ -17878,10 +19395,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Éditer un cinéma" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliothèque" @@ -17890,10 +19407,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Éditer une bibliothèque" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Centre artistique" @@ -17901,10 +19417,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Éditer un centre artistique" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Théâtre" @@ -17913,10 +19429,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Éditer un théatre" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Lieu de culte" @@ -17926,5 +19442,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 "Éditer un lieu de culte" @@ -17933,6 +19449,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 "Religion" @@ -17941,66 +19457,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 "bahai" -#: 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 "buddhist" -#: 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 "christian" -#: 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 "hindu" -#: 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 "jain" -#: 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 "jewish" -#: 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 "muslim" -#: 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 "sikh" -#: 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 "spiritualist" -#: 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 "taoist" -#: 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 "unitarisme" -#: 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 "zoroastrian" -#: 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 "Dénomination" @@ -18009,81 +19525,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 "anglican" -#: 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 "baptist" -#: 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 "catholique" -#: 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 "evangelical" -#: 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 "jehovahs_witness" -#: 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 "lutheran" -#: 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 "methodist" -#: 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 "mormon" -#: 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 "orthodox" -#: 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 "pentecostal" -#: 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 "presbyterian" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresses" @@ -18092,5 +19608,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Editez l'adresse" @@ -18098,5 +19614,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Numéro du bâtiment" @@ -18104,20 +19620,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nom de la maison" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Nom de la ville" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Code postal" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Indicatif du pays" @@ -18125,5 +19641,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolation d’adresse" @@ -18132,5 +19648,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Éditer l’interpolation d’adresse" @@ -18138,71 +19654,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Schéma de numérotation" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "pair" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "impair" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "all" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alphabétique" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Édifices" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Usine" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Éditer une usine" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Structure de hauteur" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Éditer une structure de hauteur" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Château d’eau" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Éditer un château d’eau" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gazomètre" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Éditer un gazomètre" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Phare" @@ -18210,10 +19722,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Éditer un phare" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Moulin à vent" @@ -18221,10 +19733,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Éditer un moulin à vent" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Pipeline" @@ -18232,10 +19744,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Éditer un pipeline" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Station d’épuration" @@ -18245,10 +19757,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 "Éditer une station d’épuration" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Grue" @@ -18256,10 +19768,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Éditer une grue permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Balise signalétique" @@ -18267,10 +19779,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Editer balise signalétique" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Équipement de topographie" @@ -18278,10 +19790,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Éditer un équipement de topographie" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Surveillance" @@ -18289,5 +19801,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Éditer une caméra de surveillance" @@ -18295,5 +19807,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Centrale électrique" @@ -18303,39 +19815,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 "Éditer une centrale électrique" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "charbon" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "photovoltaïque" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gaz" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Station électrique" @@ -18344,10 +19856,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Editez une station électrique" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformateur électrique" @@ -18356,5 +19868,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Modifier transformateur électrique" @@ -18362,10 +19874,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 "Champ de vision" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Pylône électrique" @@ -18376,5 +19888,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 "Éditer un pylône électrique" @@ -18382,5 +19894,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Ligne de courant" @@ -18389,46 +19901,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Editez une ligne de courant" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Tension" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Nombre de câbles" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Équipements" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toilettes" -#. 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 "Numéro de référence" - #. 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 "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Boîte aux lettres" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Téléphone" @@ -18437,5 +19943,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Éditer un téléphone" @@ -18443,5 +19949,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 "Pièces" @@ -18449,5 +19955,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 "Billets" @@ -18455,5 +19961,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 "Cartes de crédit temporaire" @@ -18461,5 +19967,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 "Cartes de débit" @@ -18467,15 +19973,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 "Cartes de crédits" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Cartes téléphoniques" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recyclage" @@ -18484,5 +19990,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Éditer un point de recylcage" @@ -18490,80 +19996,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Canettes" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Vêtements" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Verre" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Ferrailleur" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Banc" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" -#. 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 "Hauteur" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "faible" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "à moitié" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "complet" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Masquer" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Verrouiller" -#. 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 "Hauteur" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "faible" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "à moitié" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "complet" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontaine" @@ -18572,10 +20074,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Éditer une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Eau potable" @@ -18584,10 +20086,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Éditer un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Tour d’abandon (nouveau né)" @@ -18595,25 +20097,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Éditer un tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Magasins" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarché" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Éditer un supermarché" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Châlet" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Editez un châlet" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Commerce de proximité" @@ -18621,10 +20133,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Éditer une épicerie" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -18632,10 +20143,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Éditer un kiosque à journaux" -#. 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 "Éditer un arrêt de bus" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Éditer un arbre isolé" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Distributeur automatique" @@ -18643,5 +20173,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Éditer un distributeur automatique" @@ -18649,88 +20179,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "food" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Boucherie" @@ -18738,10 +20268,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Éditer une boucherie" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Boulanger" @@ -18749,10 +20278,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Éditer une boulangerie" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Fleuriste" @@ -18760,20 +20288,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Modifier fleuriste" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Boutique bio" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Modifier boutique bio" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Alcool" @@ -18781,60 +20307,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Modifier commerce d'acool" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Boissons" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Modifier débit de boissons" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Informatique" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Modifier magasin informatique" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Électronique" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Modifier magasin d’électronique" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Modifier boutique Hi-Fi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Ameublement" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Modifier magasin d’ameublement" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Jardinerie" @@ -18842,10 +20362,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Modifier jardinerie" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Quincaillerie" @@ -18853,10 +20372,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Modifier quincaillerie" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Magasin de bricolage" @@ -18864,60 +20382,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Éditer un magasin de bricolage" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Papeterie" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Modifier papeterie" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Coiffeur" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Editez un Coiffeur" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Magasin de chaussures" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Modifier magasin de chaussures" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Jouets" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Modifier magasin de jouets" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Vidéoclub" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Modifier vidéoclub" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Pressing" @@ -18925,10 +20437,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Éditer un pressing" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Laverie libre-service" @@ -18936,10 +20447,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Éditer une laverie" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Magasin de sports d’extérieur" @@ -18947,35 +20457,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Éditer un magasin de sports d’extérieur" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sports" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Modifier magasin de sport" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Opticien" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Modifier opticien" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banque" @@ -18983,16 +20490,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Editez une banque" -#. 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 "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Bureau de change" @@ -19000,5 +20505,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Éditer un bureau de change" @@ -19006,15 +20511,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Éditer un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Médecin" @@ -19022,20 +20527,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Modifier Médecin" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dentiste" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Editez le Dentiste" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Pharmacie" @@ -19043,5 +20546,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Éditer pharmacie" @@ -19049,10 +20552,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Dispensaire" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Hôpital" @@ -19060,10 +20562,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Éditer hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -19072,5 +20574,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Éditer point d’accès d’urgence" @@ -19079,20 +20581,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Numéro de téléphone" #. 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 "(Utiliser le code international, comme +12-345-67890" @@ -19100,5 +20602,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 "Vétérinaire" @@ -19107,55 +20609,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Editez un Vétérinaire" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Éditer un continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Pays" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Éditer un pays" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Département" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Éditer un état" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Région" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Éditer une région" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Comté/Canton" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Éditer un comté/canton" @@ -19163,15 +20665,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Editez la ville" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Ville 10 000 à 100 000 habitants" @@ -19179,10 +20681,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Editez la ville" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Banlieue" @@ -19190,25 +20692,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Éditer une banlieue" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Éditer un village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Hameau" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Éditer un hameau" @@ -19216,5 +20718,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Lieu-dit" @@ -19222,10 +20724,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Éditer un lieu-dit" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "île" @@ -19233,11 +20735,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Éditer une île" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "gauche" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Editez un châlet" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -19245,10 +20760,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Éditer une entrée de grotte" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Sommet" @@ -19256,10 +20771,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Modifier un pic" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Glacier" @@ -19267,10 +20782,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Éditer un glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Volcan" @@ -19278,70 +20793,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Éditer un volcan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nationale" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Éditer une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Éditer une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Éditer une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politique" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Éditer une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Parc national" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Éditer les frontières d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Arbre" @@ -19350,15 +20865,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Éditer un arbre isolé" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Bois" @@ -19367,5 +20882,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Éditer un bois" @@ -19373,17 +20888,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 "coniferous" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Forêt" @@ -19392,14 +20907,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Éditer une forêt" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Éditer une réserve naturelle" @@ -19407,25 +20922,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Zone d’éboulements" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Éditer une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Broussailles" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Éditer des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Talus" @@ -19433,10 +20948,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Éditer un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Lande" @@ -19444,5 +20959,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Éditer une lande" @@ -19450,5 +20965,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Bâtiments de ferme" @@ -19457,45 +20972,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Éditer des bâtiments de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Terrains de ferme" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Éditer des terrains de ferme" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Prairie" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Editer prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vigne" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Éditer une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Jardins familiaux" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Éditer des jardins familiaux" @@ -19503,25 +21018,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Jardin" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Éditer un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Herbe" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Éditer de l’herbe" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Zone publique herborée" @@ -19529,10 +21044,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Éditer une zone publique herborée" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Espace commun" @@ -19540,20 +21055,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Éditer un espace commun" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Parc" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Editez un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -19561,5 +21076,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Éditer une aire de jeux" @@ -19567,15 +21082,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Zone résidentielle" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Éditer une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Petit cimetière" @@ -19583,9 +21098,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Éditer un petit cimetière" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cimetière" @@ -19593,39 +21108,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Éditer un cimetière" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Zone commerciale" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Éditer une zone commerciale" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Bureaux" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Éditer des bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Zone industrielle" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Éditer une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Zone ferroviaire" @@ -19633,15 +21148,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Éditer une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militaire" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Éditer un terrain militaire" @@ -19649,55 +21164,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Zone de construction" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Éditer un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Terrain en friche" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Éditer un terrain en friche" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Espace vert" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Éditer une nouvelle zone de construction" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Décharge" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Éditer une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Carrière" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Éditer une carrière" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multypoligone" @@ -19707,5 +21222,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 "Modifier un multipolygone" @@ -19714,10 +21229,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "segment extérieur" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "segment intérieur" @@ -19725,5 +21240,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -19732,5 +21247,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -19738,34 +21253,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "Interdiction d'aller tout droit" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "Obligation d'aller tout droit" @@ -19774,15 +21289,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "chemin d'origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "nœud ou chemin de passage" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "chemin destination" @@ -19790,5 +21305,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Route" @@ -19797,5 +21312,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Modifier une route" @@ -19803,5 +21318,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Type de route" @@ -19873,5 +21388,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 @@ -19880,17 +21395,17 @@ msgstr "vélo/bicyclette" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "route" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19943,5 +21458,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 @@ -19950,13 +21465,13 @@ msgstr "piéton" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "randonnée" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "détour" @@ -19970,10 +21485,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Description du symbole" @@ -19981,31 +21496,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Réseau" #. 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 "proposé" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Couleur (hexa)" @@ -20014,30 +21529,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "segment de route" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "point d'arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "point d'arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "point d'arrêt précédent" @@ -20475,11 +21990,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 "déprécié" @@ -20805,41 +22320,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 "rue" #. color street @@ -22540,5 +24018,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 "eau (claire)" @@ -23137,55 +24615,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23199,5 +24628,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 "tourisme" @@ -23269,8 +24698,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 "patrimoine" @@ -23341,8 +24770,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 "espace vert" @@ -23356,5 +24785,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "carrière" @@ -23368,5 +24797,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "décharge" @@ -23388,5 +24817,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "bassin" @@ -23400,5 +24829,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "forêt" @@ -23412,5 +24841,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "bâtiments de ferme" @@ -23433,5 +24862,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "commerce de proximité" @@ -23445,5 +24874,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "zone industrielle" @@ -23457,5 +24886,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "terrain en friche" @@ -23469,5 +24898,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "espace vert" @@ -23481,5 +24910,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "zone ferroviaire" @@ -23536,7 +24965,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 "zone militaire" @@ -23550,5 +24979,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cimetière" @@ -23561,5 +24990,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "sommet" @@ -23574,5 +25003,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "glacier" @@ -23586,5 +25015,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "volcan" @@ -23639,8 +25068,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 "nature" @@ -23654,5 +25083,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "broussailles" @@ -23666,20 +25095,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "lande/bruyère" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "bois" - #. color water #. 1 @@ -23690,5 +25107,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "terrain boueux/vase" @@ -23702,5 +25119,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "plage" @@ -23778,8 +25195,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 "route" @@ -23827,7 +25244,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 "frontière" @@ -23969,10 +25386,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 "lieu" @@ -24020,6 +25446,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 "adresse" @@ -24169,5 +25595,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Chemin non-classifié non nommé." #. way : W : highway == unclassified && name != * @@ -24280,5 +25706,5 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? @@ -24316,9 +25742,110 @@ msgstr "Terraserver Urbain" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Sélectionner le tableau d'assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Indication : Certains changements viennent de l’envoi de nouvelles " +#~ "données sur le serveur." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Veuillez sélectionner des chemins avec des angles droits afin de les " +#~ "orthogonaliser." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier " +#~ "plan. L'exception était : {0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. " +#~ "Merci de signaler ceci comme une erreur." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Aucun document ouvert donc rien à sauvegarder." + +#~ msgid "Change {0} {1}" +#~ msgstr "Changer {0} {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Supprimer {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "supprimer le membre de la relation {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" + +#~ msgid "nodes" +#~ msgstr "nœuds" + +#~ msgid "ways" +#~ msgstr "chemins" + +#~ msgid "relations" +#~ msgstr "relations" + +#~ msgid "changesets" +#~ msgstr "jeux de données" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Impossible de charger l’historique depuis le serveur. Détails :
" +#~ "{0}" + +#~ msgid "Delete Layer" +#~ msgstr "Supprimer le calque" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Tout supprimer" + +#~ msgid "Authors: {0}" +#~ msgstr "Auteurs : {0}" + +#~ msgid "Public" +#~ msgstr "Public" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de " +#~ "charger." + +#~ msgid "Continue anyway" +#~ msgstr "Continuer tout de même" + +#~ msgid "Copy Default" +#~ msgstr "Copier défaut" + +#~ msgid "Edit Information Office" +#~ msgstr "Modifier Office du Tourisme" + +#~ msgid "Map Type" +#~ msgstr "Type de carte" + +#~ msgid "map" +#~ msgstr "carte" + +#~ msgid "citymap" +#~ msgstr "carte de la ville" + +#~ msgid "hikingmap" +#~ msgstr "carte de randonnée" + +#~ msgid "bicyclemap" +#~ msgstr "carte de randonnée cycliste" + +#~ msgid "Board Type" +#~ msgstr "Type de bureau" + +#~ msgid "board" +#~ msgstr "tableau" #~ msgid "Move" @@ -24327,7 +25854,4 @@ #~ msgid "Data Layer" #~ msgstr "Calque de données" - -#~ msgid "Not implemented yet." -#~ msgstr "Pas encore implémenté." #~ msgid "Unknown file extension." @@ -24605,4 +26129,7 @@ #~ msgstr "Magasin de sport" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Sélectionner le tableau d'assemblage" + #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -24886,4 +26413,7 @@ #~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données" +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)" + #~ msgid "" #~ "No data to update found. Have you already opened or downloaded a data " @@ -24899,7 +26429,4 @@ #~ msgstr "Échec d’initialisation de l’API" -#~ msgid "image loading..." -#~ msgstr "chargement de l’image..." - #~ msgid "No data" #~ msgstr "Aucune donnée" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 17484) +++ /applications/editors/josm/i18n/po/gl.po (revision 17485) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" "PO-Revision-Date: 2009-06-27 15:34+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Creando Interface (GUI) principal" #. 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 "Axuda" -#: ../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 "" -#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Erro" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor." - -#: ../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] "Hai cambios sen gardar. Descartar os cambios e continuar?" +msgstr[1] "Hai cambios sen gardar. Descartar os cambios e continuar?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Cambios non gardados" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Hai cambios sen gardar. Descartar os cambios e continuar?" - -#: ../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 "Gardar e Sair" -#: ../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 "Descartar e Sair" -#: ../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 "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{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 "Ignorando URL de ficheiro mal formada: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Engadidos" @@ -344,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -359,5 +376,5 @@ msgstr "" -#: ../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 "" @@ -367,11 +384,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -380,5 +397,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 "" @@ -395,11 +412,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 @@ -428,5 +445,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 "Latitude" @@ -435,30 +452,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 "Lonxitude" +#: ../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 "Alinear os nodos en círculo" -#: ../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 "Mover os nodos seleccionados a un círculo." -#: ../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 @@ -472,6 +489,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 @@ -479,58 +496,57 @@ msgstr "Ferramenta: {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 "Por favor, selecciona polo menos catro nodos." #. 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 "Información" #. 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 "Alinear os nodos en fila" -#: ../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 "Mover os nodos seleccionados a unha liña." -#: ../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 "Por favor, selecciona polo menos tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -539,10 +555,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -551,5 +567,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -558,46 +574,46 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "selección" -#: ../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 "conflito" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "descargar" +#: ../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 "Facer zoom a {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 "Facer zoom na vista a {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 @@ -607,22 +623,22 @@ msgstr "Vista: {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 "Non se seleccionou nada sobre o que facer zoom." -#: ../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 "Non hai conflitos sobre os que facer zoom" +#: ../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 "Combinar vía" -#: ../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 "Combinar varias vías en unha." -#: ../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 "Por favor, selecciona polo menos dúas vías para combinar." @@ -633,4 +649,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Combinar de todas formas" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -638,19 +658,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Combinar de todas formas" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Cambiar direccións?" - -#: ../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 "" -"As vías non poden ser combinadas coas súas direccións actuais. Queres " -"invertir algunhas?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -658,27 +666,34 @@ msgstr "Invertir e Combinar" -#: ../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 "" +"As vías non poden ser combinadas coas súas direccións actuais. Queres " +"invertir algunhas?" + +#: ../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 "Introducir valores para todos os conflitos." -#: ../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 "Resolver Conflitos" -#: ../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 "Combinar {0} vías" -#: ../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 "Todas as vías están vacías" -#: ../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 " @@ -688,32 +703,32 @@ "serie de nodos)" +#: ../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 "Copiar" -#: ../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 "Copiar os obxectos seleccionados ó buffer de pegado." -#: ../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 "Por favor, selecciona algo para copiar" +#: ../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 "Crear Círculo" -#: ../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 "Crear un círculo a partir de tres nodos seleccionados." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -723,20 +738,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 "Borrar" @@ -746,86 +761,87 @@ msgstr "Borrar obxectos seleccionados." -#: ../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 "Sobrescribir" -#: ../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 "O ficheiro existe. Sobrescribir?" #. 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 "Distribuir Nodos" -#: ../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 "" "Distribuir os nodos seleccionados de xeito equidistante ao longo dunha liña." +#: ../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 "Descargar de 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 "Descargar datos do mapa do servidor 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 "Ficheiro: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Descargar" -#: ../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 "Por favor, selecciona polo menos unha tarefa para descargar" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -834,6 +850,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 "Duplicar" @@ -857,85 +873,90 @@ msgstr "Sair da aplicación," +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +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 "Exportar a 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 "Exportar os datos a un ficheiro 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 "Nada que exportar. Adquire antes algún dato." -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Axuda en liña de 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 "Abrir nun navegador" -#: ../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 "Edición" -#: ../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 "Recargar" -#: ../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 "So se poden editar páxinas de axuda da Axuda en liña de JOSM" -#: ../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 "Erro durante a carga da páxina {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." msgstr "Páxina de axuda perdida. Créea en inglés." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -989,22 +1010,26 @@ 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 "Acoplar Nodos" -#: ../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 "Acoplar nodos no máis antigo" -#: ../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 "Por favor, selecciona polo menos dous nodos a acoplar." +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 +msgid "Merge nodes with different memberships?" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge nodes with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +msgid "Merge Anyway" +msgstr "Acoplar de todas formas" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1012,9 +1037,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Acoplar de todas formas" - -#: ../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 "" @@ -1022,69 +1043,69 @@ "uso." -#: ../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 "Acoplar {0} nodos" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Reflexar" -#: ../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 "Reflexar os nodos e vías seleccionados." -#: ../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 "Por favor, seleccione como mínimo un nodo ou vía." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "arriba" -#: ../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 "Mover obxectos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "abaixo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "esquerda" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "dereita" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Mover {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 "Move Obxectos {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 "Non se poden mover objectos fora do mundo." @@ -1092,5 +1113,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 "Nova" @@ -1100,17 +1121,22 @@ msgstr "Crear un novo mapa." -#: ../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 "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Abrir un ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Abrir un ficheiro." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Papel \"{0}\" descoñecido." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1148,22 +1174,18 @@ msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "So se permiten dous nodos" -#: ../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 "A selección debe estar formada só por vías." -#: ../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 "" "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." - -#: ../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 " @@ -1172,9 +1194,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 "Só hai un nodo seleccionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -1190,15 +1212,28 @@ msgstr "Pegar contidos ó buffer de pegado." -#: ../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 "Pegar Etiquetas" -#: ../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 "" "Aplicar as etiquetas dos contidos do buffer de pegado a todos os elementos " "seleccionados." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Desfacer o borrado de {0} primitivas" +msgstr[1] "Desfacer o borrado de {0} primitivas" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1224,37 +1259,32 @@ msgstr "Refacer a última acción desfeita." -#: ../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 "Renomear capa" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Renomear tamén o ficheiro" -#: ../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 "" +#: ../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 "Invertir Vías" -#: ../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 "Invertir a dirección de todas as vías seleccionadas." -#: ../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 "Por favor, selecciona polo menos unha vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Invertir vías" @@ -1262,10 +1292,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 "Gardar" #: ../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 "Gardar os datos actuais." @@ -1276,37 +1307,25 @@ msgstr "O arquivo {0} existe. Sobreescribir?" -#: ../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 "" -"Erro Interno: non se poden comprobar as condicións para ningunha capa. Por " -"favor, informa disto como un erro." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Non hai documentos abertos, polo que non hai nada que gardar." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Documento valeiro" -#: ../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 "O documento non contén datos." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Gardar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflitos" -#: ../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 " @@ -1316,28 +1335,28 @@ "como se os rexeitases todos. Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Rexeitar Conflitos e Gardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Gardar ficheiro OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Gardar ficheiro GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Gardar Capa" +#: ../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 "Gardar como..." -#: ../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 "Gardar os datos actuais nun novo ficheiro." @@ -1372,33 +1391,33 @@ msgstr "Axda: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Informe de Estado" -#: ../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 "Copiar a porta papeis e pechar" -#: ../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 "Pechar" +#: ../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 "Separar Vía" -#: ../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 "Separar unha vía no nodo seleccionado." -#: ../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 "A selección actual non pode ser usada para a separación." -#: ../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." @@ -1406,5 +1425,5 @@ msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía." -#: ../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 " @@ -1420,9 +1439,9 @@ "selecciona tamén a vía." -#: ../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 "Os nodos seleccionados non comparten a mesma vía." -#: ../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." @@ -1430,10 +1449,10 @@ msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados." -#: ../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 "Debes seleccionar dous ou máis nodos para separar unha vía circular." -#: ../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 " @@ -1443,5 +1462,5 @@ "nodos no medio da vía.)" -#: ../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 " @@ -1449,5 +1468,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 " @@ -1455,8 +1474,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 "Separar a vía {0} en {1} partes" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Pechando colección de cambios..." + +#: ../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 "Pechando colección de cambios..." + +#: ../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 "Pechando colección de cambios..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Pechando colección de cambios..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1474,47 +1518,47 @@ msgstr "Cambia a configuración global \"{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 "Despegar Vías" -#: ../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 "Duplicar nodos que son usados por múltiples vías." -#: ../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 "Este nodo non está pegado a outra cousa." -#: ../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 "Ningún destes nodos estan pegados a outra cousa." -#: ../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 "Ningún dos nodos desta vía están pegados a outra cousa." -#: ../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 "A selección actual non pode ser usada para despegar." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Seleccionar ou ben:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, ou" -#: ../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 "* Un nodo que está sendo usado por máis dunha vía, ou" +#: ../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 "" +"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" + #: ../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 "" -"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" - -#: ../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" @@ -1523,5 +1567,5 @@ "vía, ou" -#: ../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." @@ -1530,5 +1574,5 @@ "vía." -#: ../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" @@ -1541,9 +1585,9 @@ "obterán as súas propias copias e todos os nodos serán seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Despegar Nodo" -#: ../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" @@ -1551,5 +1595,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" @@ -1594,61 +1638,71 @@ "Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)" -#: ../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 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Actualizar Selección" -#: ../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 "Actualiza as primitiva seleccionadas actualmente dende o servidor" -#: ../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 "Non hai primitivas seleccionadas para actualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Selección valeira" -#: ../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 "Subir a 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 "SIbir todos os cambios ó servidor 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 "Hai conflitos sen resolver. Debes resolver estes antes." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algún dato antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Hai conflitos sen resolver. Debes resolver estes antes." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Non hai cambios que subir." -#: ../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 "Sincronizar só {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 "Sincronizar o paquete de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1670,17 +1724,17 @@ "continuar editando.
" -#: ../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 "Detectado un conflito" #. 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 "valor retornado non esperado. Obtívose {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1696,5 +1750,5 @@ "editando.
" -#: ../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}\"" @@ -1703,27 +1757,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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Actualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Subir estes cambios?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Subir Cambios" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Engadir un novo nodo a unha via existente" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1731,31 +1823,79 @@ 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 "Proporciona un breve comentario para os cambios que vas a subir:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Preferencias do Mapa" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Obxectos para engadir:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Obxectos para modificar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Obxectos para borrar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Proporciona un breve comentario para os cambios que vas a subir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Subir estes cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Subir Cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Actualizando" +#: ../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] "Obxectos para engadir:" +msgstr[1] "Obxectos para engadir:" + +#: ../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] "Obxectos para modificar:" +msgstr[1] "Obxectos para modificar:" + +#: ../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] "Obxectos para borrar:" +msgstr[1] "Obxectos para borrar:" + +#: ../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 "Último cambio en {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1779,20 +1919,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 "Audio: {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 "Máis rápido" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Avance máis rápido" @@ -1834,10 +1974,10 @@ msgstr "Reproducir a marca anterior." -#: ../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 "Máis lento" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Avance máis lento" @@ -1865,31 +2005,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 "Non se importaron datos." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Datos 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 "Descarga {0} de {1} ({2} restantes)" -#: ../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 "Erros durante a descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1901,20 +2037,20 @@ msgstr "" -#: ../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 "Primitivas borradas ou movidas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Borrar Modo" -#: ../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 "Borrar nodos ou vías." -#: ../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 @@ -1923,5 +2059,5 @@ msgstr "Modo: {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 " @@ -1931,55 +2067,69 @@ "nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos." -#: ../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 "o parámetro \"{0}\" debe non ser nulo" +#: ../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 "Debuxar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Debuxar nodos" -#: ../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 "Foco do Debuxo" -#: ../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 @@ -1987,38 +2137,38 @@ msgstr "seleccionado" -#: ../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 "Non se pode engadir un nodo fora do mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Engadir nodo" -#: ../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 "Engadir nodo na vía" -#: ../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 "Conectar via existente a nodo" -#: ../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 "Engadir un novo nodo a unha via existente" -#: ../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 "Engadir nodo a vía e conectar" -#: ../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 "Crear novo nodo." -#: ../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 "Seleccionar nodo baixo o cursor." -#: ../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." @@ -2027,14 +2177,14 @@ msgstr[1] "Insertar novo nodo en {0} vías." -#: ../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 "Comezar nova vía a partir do último nodo." -#: ../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 "Continuar vía a partir do último nodo." -#: ../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 "Rematar debuxo." @@ -2054,5 +2204,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 "Soltar o botón do rato para seleccionar os obxectos do rectángulo." @@ -2064,5 +2214,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 "Soltar o botón do rato para deter a rotación." @@ -2080,17 +2230,18 @@ "audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." +#: ../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 "Seleccionar" -#: ../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 "Seleccionar, mover e rotar obxectos" -#: ../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" @@ -2099,25 +2250,29 @@ msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." @@ -2126,5 +2281,5 @@ "próximo." -#: ../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-" @@ -2151,60 +2306,60 @@ "+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" +#: ../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 "Buscar..." -#: ../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 "Buscar obxectos." -#: ../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 "Por favor, introduce unha cadea de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "reemplazar selección" -#: ../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 "engadir á selección" -#: ../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 "eliminar da selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "sensible a maiúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "expresión regular" -#: ../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' e 'Street' en calquer clave ou nome." -#: ../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' en calquera clave ou nome." -#: ../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' en calquer posición do nome." -#: ../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 - a clave 'type' co valor exacto '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, " @@ -2214,50 +2369,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 - que non conteña 'Bak' no nome." -#: ../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: - clave=foot establecida con calquer valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Obxectivos especiais:" -#: ../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: - tipo do obxecto(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:... - todos os obxectos cambiados polo usuario" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - obxecto coa ID indicada" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - obxecto coa ID indicada" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - obxectro có número de nodos indicado" -#: ../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 - todos os obxectos cambiados" -#: ../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 - todos os obxectos seleccionados" -#: ../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 - todos os obxectos incompletos" -#: ../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 "untagged - todos os obxectos sen etiquetar" -#: ../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" @@ -2266,5 +2422,5 @@ "coa expresión" -#: ../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" @@ -2273,54 +2429,54 @@ "expresión" -#: ../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 "Usar | ou OR para combinar co operador OU lóxico" -#: ../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 "Usar \" para escapar operadores (p.e. se a clave conten : )" -#: ../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 "Usar ( e ) para agrupar expresións" -#: ../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 "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Comezar Busca" -#: ../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 "Non se atoparon coincidencias para \"{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 "Non se engadiu nada á selección buscando por \"{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 "Non se eliminou da selección buscando por \"{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 "Atopadas {0} coincidencias" -#: ../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" @@ -2389,58 +2545,96 @@ msgstr "Valor incorrecto do operador id: {0}. Espérase un número." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Cargar Selección" -#: ../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 "Contacto {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Descargando..." -#: ../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 "Non se puido ler dende a URL: \"{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 "Erro de análise na URL: \"{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 "Erro durante a comunicación co servidor." -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Engadir nodo" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relacións: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Cambiar {0} obxecto" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Último cambio en {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Cambiar relación" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Eliminar \"{0}\" para {1} \"{2}\"" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Eliminar \"{0}\" para {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 "Eliminar \"{0}\" para {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Establecer {0}={1} para {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 "Establecer {0}={1} para {2} \"{3}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Establecer {0}={1} para {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" @@ -2449,10 +2643,10 @@ msgstr[1] "obxectos" -#: ../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 "Eliminar \"{0}\" para {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}" @@ -2464,5 +2658,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2471,10 +2665,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2483,5 +2677,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}''" @@ -2505,44 +2699,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {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] "Borrar {0} {1}" +msgstr[1] "Borrar {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] "Borrar Modo" +msgstr[1] "Borrar Modo" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Borrar {0} {1}" +msgstr[1] "Borrar {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] "Borrar da relación" +msgstr[1] "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relación contradictoria" -#: ../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 "Borrar da relación" + +#: ../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 "" "A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n" "Borrar da relació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 "Borrar da relación" - -#: ../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 "" "A selección \"{0}\" é usada pola relación \"{1}\".\n" "Borrar da relación?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Separar segmento de vía" @@ -2550,6 +2760,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." @@ -2561,5 +2771,5 @@ "estar usandoos.
Queres borralos realmente?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2570,5 +2780,5 @@ msgstr "Resolver conflitos en estado borrado en {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" @@ -2605,10 +2815,20 @@ msgstr "Resolver conflitos na lista de membros da relación {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2621,17 +2841,37 @@ msgstr "Secuencia" -#: ../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 "Resolver {0} conflitos de etiquetas en {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 "Resolver {0} conflitos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Desfacer o borrado de {0} primitivas" -#: ../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 "Resolver conflitos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Resolver conflitos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Resolver conflitos de versión para {0} {1}" @@ -2658,13 +2898,13 @@ "seus nodos son suxeridos para manter a consistencia dos datos." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relación" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Papel antigo" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Novo papel" @@ -2683,64 +2923,121 @@ #: ../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 "Novo valor" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Aplicar os cambios seleccionados" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Non aplicar cambios" -#: ../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 "Por favor, selecciona que cambios de propiedade queres aplicar." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Propiedades de " -#: ../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 "Papeis nas relacións que fan referencia a" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Corrección" -#: ../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 "Ficheiro de configuración mal formado nas liñas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Non se pode abrir o directorio de preferencias: {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 "" "O ficheiro de preferencias contiña erros. Creando copia de seguridade do " "antigo a {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 "Preferencias almacenadas en {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 "Non se puideron subir as preferencias. Razón: {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 "Non se puideron cargar as preferencias dende o servidor." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2754,29 +3051,36 @@ msgstr "" -#: ../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 "Grados Decimais" -#: ../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 "Grados Minutos Segundos" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../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}" @@ -2788,15 +3092,232 @@ msgstr "Requírese o parámetro {0} > 0. Obtívose {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 "incompleto" - -#: ../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 "Erro: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Advertencia: {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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{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 "Non hai unha primitiva coa versión {0} en este historial" + +#: ../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 "Non hai unha versión válida con data \"{0}\" en este historial" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "non se atopou unha versión anterior. O historial está valeiro." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "non se atopou a última versión. O historial está valeiro." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos" + +#: ../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 "" +"Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de " +"datos" + +#: ../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 "esperabase o parámetro \"{0}\" > 0, obtívose \"{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 "" +"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa 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 "o parámetro {0} non está no rango 0..{1}, obtívose {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "A vía de estilo de área non está pechada." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "a vía multipoligonal \"{0}\" non está pechada." + +#. 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 "Membro vacío na relación." + +#: ../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 "Membro \"{0}\" borrado na relación." + +#: ../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 "Vía \"{0}\" con menos de dous puntos." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Atopadas máis de unha vía \"desde\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Atopadas máis de unha vía \"ata\"." + +#: ../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 "Atopouse máis de un \"vía\"." + +#: ../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 "Papel \"{0}\" descoñecido." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Tipo de membro descoñecido para \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Non se atoparon vias \"desde\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Non se atoparon vías \"ata\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Ningún nodo o vía \"vía\" atopados." + +#: ../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 "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" + +#: ../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 "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Non se atopou o estilo para a restrición {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Intersección entre as vías ''{0}'' e ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "A vía interior ''{0}'' está fóra." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "Sen etiquetar" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "texto" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "Inactivo" + #: ../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" @@ -2805,22 +3326,7 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Erro: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Advertencia: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nodos" - -#: ../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" @@ -2829,12 +3335,7 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "vías" - -#: ../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" @@ -2843,249 +3344,4 @@ msgstr[1] "relacións" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relacións" - -#: ../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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} membro" -msgstr[1] "{0} membros" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "Carretera" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "Vía férrea" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "Vía acuática" - -#: ../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} nodo" -msgstr[1] "{0} nodos" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Non hai unha primitiva coa versión {0} en este historial" - -#: ../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 "Non hai unha versión válida con data \"{0}\" en este historial" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "non se atopou unha versión anterior. O historial está valeiro." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "non se atopou a última versión. O historial está valeiro." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos" - -#: ../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 "" -"Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de " -"datos" - -#: ../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 "esperabase o parámetro \"{0}\" > 0, obtívose \"{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 "" -"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa 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 "o parámetro {0} non está no rango 0..{1}, obtívose {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "A vía de estilo de área non está pechada." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "a vía multipoligonal \"{0}\" non está pechada." - -#. 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 "Membro vacío na relación." - -#: ../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 "Membro \"{0}\" borrado na relación." - -#: ../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 "Vía \"{0}\" con menos de dous puntos." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Atopadas máis de unha vía \"desde\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Atopadas máis de unha vía \"ata\"." - -#: ../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 "Atopouse máis de un \"vía\"." - -#: ../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 "Papel \"{0}\" descoñecido." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Tipo de membro descoñecido para \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Non se atoparon vias \"desde\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Non se atoparon vías \"ata\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Ningún nodo o vía \"vía\" atopados." - -#: ../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 "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" - -#: ../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 "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Non se atopou o estilo para a restrición {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Intersección entre as vías ''{0}'' e ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "A vía interior ''{0}'' está fóra." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "Sen etiquetar" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "texto" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "Inactivo" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3098,5 +3354,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "fondo" @@ -3106,5 +3362,5 @@ msgstr "destacar" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3114,5 +3370,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3123,21 +3379,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Zona Lambert (Franza)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Zona Lambert (Estonia)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3158,8 +3414,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3167,17 +3423,103 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Non amosar de novo" -#: ../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/DefaultNameFormatter.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr "" + +#: ../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 "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "Carretera" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "Vía férrea" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "Vía acuática" + +#: ../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} nodo" +msgstr[1] "{0} nodos" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} membro" +msgstr[1] "{0} membros" + +#: ../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 "" "Fallo ao iniciar comunicación co servidor OSM {0}.\n" "Comproba o URL do servidor nas preferencias e a túa conexión a 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 "descoñecido" + +#: ../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 "" @@ -3190,36 +3532,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Violación de condición previa" -#: ../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 "descoñecido" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3229,9 +3544,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 "" @@ -3240,9 +3555,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3251,9 +3566,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 "" @@ -3263,9 +3589,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Maquina descoñecida" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3278,12 +3604,7 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "A primitiva xa foi borrada" - -#: ../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 @@ -3300,38 +3621,38 @@ msgstr "Descargando \"Mensaxe do día\"" -#: ../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 "Subir Preferencias" -#: ../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 "Subir as preferencias actuais ó servidor" -#: ../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 "cadea" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nome do usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Contrasinal de 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 "Redimensionar o applet á xeometría indicada (formato: ANCHOxALTO)" -#: ../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 "cadea;cadea;..." -#: ../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 " @@ -3341,5 +3662,5 @@ "lat=y&lon=x&zoom=z ou un nome de ficheiro" -#: ../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 " @@ -3349,5 +3670,5 @@ "contendo lat=y&lon=x&zoom=z ou un nome de ficheiro" -#: ../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 " @@ -3357,75 +3678,94 @@ "google ou unha URL que devolva osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "calquera" -#: ../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 "Si se especifica, reestablecer a configuración en lugar de lela." -#: ../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 "Nome de usuario" -#: ../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 "Contrasinal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opcións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Amosar esta axuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Argumento de xeometría unix estandar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Descargar a caixa de límites" -#: ../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 "Descargar a ubicación da url (con 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 "Abrir ficheiro (como datos gps en bruto, se é .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 "Descargar a caixa de límites como datos gps en bruto" -#: ../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 "Seleccionar coa busca indicada" -#: ../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 "Restablecer as preferencias ós valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Establecer o idioma." -#: ../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 "exemplos" -#: ../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" @@ -3435,47 +3775,47 @@ "que cargas algo de información antes de --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 "En lugar de --download= debes especificar 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 "Activando extensións actualizadas" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Cargando extensións anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Establecendo valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Cargando extensións" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Ferramentas" -#: ../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 "Axustes prestablecidos" -#: ../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 @@ -3487,21 +3827,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 "Vista de malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Cambiar Vista de Malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Cambiar a vista de pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3541,58 +3881,44 @@ msgstr "Reducir Zoom" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "escalar" -#: ../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 "A lonxitude xeográfica na posición do punteiro do rato." -#: ../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 "O nome do obxecto na posición do punteiro do rato." -#: ../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 "A latitude xeográfica na posición do punteiro do rato." -#: ../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 "O ángulo entre o segmento previo e o actual da vía." -#: ../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 "A dirección (da brúxula) do segmento de liña que se está a debuxar." -#: ../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 "A lonxitude do novo segmento de vía que se está a debuxar." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(sen obxecto)" -#: ../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 "a capa non está na lista." -#: ../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 "" - -#: ../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 "" @@ -3604,10 +3930,4 @@ msgid "File not found" msgstr "Ficheiro non atopado" - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3669,7 +3989,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" @@ -3685,5 +4004,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" @@ -3786,5 +4105,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 "" @@ -3795,5 +4114,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" @@ -3807,5 +4126,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 "" @@ -3880,6 +4199,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" @@ -3989,10 +4308,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 "" @@ -4001,19 +4320,19 @@ msgstr "" -#: ../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 "Si, desfacer o borrado de eles tamén" -#: ../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 "Non, cancelar a operación" -#: ../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 "" @@ -4024,5 +4343,5 @@ "servidor.

Quere desfacer o borrado de eses nodos tamén?" -#: ../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 "Desfacer o borrado de nodos adicionais?" @@ -4040,9 +4359,9 @@ msgstr "Desfacer o borrado de primitivas dependentes?" -#: ../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 " @@ -4050,110 +4369,112 @@ 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 "borrado" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4162,21 +4483,21 @@ msgstr "" -#: ../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 "Papel" #: ../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 "" @@ -4215,10 +4536,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 @@ -4227,10 +4549,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 @@ -4244,5 +4567,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}" @@ -4283,4 +4606,138 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "Escolle unha cor" + +#: ../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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{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 "o parámetro \"{0}\" debe non ser nulo" + +#: ../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 "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {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 +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 "Ainda sen implementar." + +#: ../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 +msgid "Tags from ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +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} vía" +msgstr[1] "{0} vías" + +#: ../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} relación" +msgstr[1] "{0} relacións" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Relación contradictoria" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Resolver Conflitos" + +#: ../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 "Pegar" + +#: ../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} vía" +msgstr[1] "{0} vías" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4296,10 +4753,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 @@ -4307,5 +4764,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}" @@ -4338,36 +4795,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 "" @@ -4379,50 +4830,55 @@ 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 "Historial" -#: ../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 "Amosar o historial de todos os elementos seleccionados." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Capa: {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 "Relacións: {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 "" - -#: ../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 "" @@ -4430,100 +4886,63 @@ #. 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 "Capas" -#: ../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 "Abrir unha lista de todas as capas cargadas." -#: ../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 "Borrar a capa seleccionada." -#: ../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 "Borrar Capa" - -#: ../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 "" - -#: ../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 "Amosar/Ocultar" -#: ../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 "Cambiar o estado visible da capa seleccionada." -#: ../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 "Mover a capa seleccionada unha fila cara arriba." -#: ../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 "Mover a capa seleccionada unha fila cara abaixo." -#: ../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." @@ -4532,28 +4951,22 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../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 "Un valor vacío borra a clave." -#: ../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 "Cambiar valores?" -#: ../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" @@ -4562,90 +4975,85 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../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 "Por favor, selecciona unha tecla" -#: ../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 "Por favor selecciona un valor" -#: ../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 "" "Por favor selecciona os obxectos dos que queres cambiar as propiedades." -#: ../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 "Propiedades dos obxectos seleccionados." #. 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 "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../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 "Engadir" -#: ../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 "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Editar Propiedades" -#: ../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 "Editar o valor da clave seleccionada para todos os obxectos" -#: ../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 "" -#: ../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 "Cambiar relación" -#: ../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 "Borrar realmente a selección da relación {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 "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Borrar Propiedades" @@ -4654,34 +5062,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 "Relacións" -#: ../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 "Abrir unha lista con todas as relacións." -#: ../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 "Relacións: {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 "Abrir un editor para a relación seleccionada" -#: ../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 "Borrar a relación seleccionada" -#: ../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 "Crear unha nova relación" -#: ../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 "" @@ -4714,23 +5122,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 "Selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} vía" -msgstr[1] "{0} vías" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relación" -msgstr[1] "{0} relacións" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4738,14 +5132,9 @@ msgstr "Selección: {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 "Desacoplar o panel" -#: ../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." @@ -4754,65 +5143,97 @@ "da esquerda." -#: ../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 "Facer click para minimizar/maximizar o contido do panel" -#: ../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 "Autores" -#: ../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 "" "Abrir a lista da xente que está a traballar nos obxectos seleccionados." -#: ../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] "Autor" +msgstr[1] "Autor" + +#: ../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 +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 "Máis información acerca desta característica" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autores: {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 "" @@ -4821,47 +5242,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 " @@ -4870,14 +5285,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 "" @@ -4887,9 +5302,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 "" @@ -4899,15 +5314,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4915,5 +5330,5 @@ msgstr "" -#: ../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 " @@ -4921,20 +5336,20 @@ msgstr "" -#: ../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 "" @@ -4943,57 +5358,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 "Mover os membros actualmente seleccionados cara arriba" #. 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 "Mover os membros seleccionados actualmente cara abaixo" #. 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 " @@ -5002,9 +5417,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 "" @@ -5013,20 +5428,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 @@ -5036,37 +5447,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 "Descargar todas as vías e nodos incompletos na relación" -#: ../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 "Descargar Membros" -#: ../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 "" @@ -5076,30 +5487,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 "" @@ -5113,22 +5524,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 "Cargando extensións anteriores" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5161,34 +5577,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Marcadores" -#: ../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 "Por favor, primeiro introduce as coordenadas desexadas." -#: ../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 "Por favor, introduce un nome para o lugar." -#: ../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 "Selecciona primeiro un marcador." @@ -5247,13 +5650,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 "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas." -#: ../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 "Por favor introduce unha cadea de busca" -#: ../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 "Non se poden ler resultados de busca de lugar dende o servidor" @@ -5261,18 +5664,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 "Introduce o nome do lugar a buscar:" -#. 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 "Lugares" #. 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 "nome" @@ -5311,37 +5713,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 "tipo" -#: ../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 "cerca" -#: ../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 "zoom" -#: ../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: " @@ -5350,5 +5752,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 "" @@ -5375,46 +5777,74 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Subir as preferencias actuais ó servidor" + +#: ../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}" +#: ../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 "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5733,14 +6163,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5916,8 +6360,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" #. @@ -6014,4 +6464,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6125,6 +6578,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 @@ -6132,153 +6585,171 @@ #: 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 "Nome" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Cambiar relación" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Máis información acerca desta característica" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Último cambio en {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6287,32 +6758,285 @@ msgstr "" -#: ../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 "Selección" + +#: ../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 "Por favor selecciona un valor" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "o parámetro \"{0}\" debe non ser nulo" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Descartar e Sair" + +#: ../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 "Gardar e Sair" + +#: ../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 +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 "Ficheiro" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Actualizando" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Non hai primitivas seleccionadas para actualizar." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Imaxes para {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 "Ler 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 "Non hai hora para o punto {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 "Non se puido ler a hora \"{0}\" do punto {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 "Non se atoparon imaxes con marcas de tempo lexibles." -#: ../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 @@ -6320,29 +7044,29 @@ msgstr "Lendo {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 "Imaxes xeo-etiquetadas" -#: ../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 "Inicio 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 "Fin 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 "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "Diferencia de zona horaria: " -#: ../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" @@ -6351,14 +7075,14 @@ msgstr[1] "imaxes" -#: ../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} dentro da traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sincronizar reloxo" -#: ../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 @@ -6366,82 +7090,82 @@ msgstr "imaxes 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 "A data no ficheiro \"{0}\" non puido ser analizada." -#: ../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 "Non hai hora EXIF no ficheiro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Imaxe" -#: ../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 "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" -#: ../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 "Zona horaria da unidade GPS (differencia coa foto)" -#: ../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 "Sincronizar hora coa da unidade 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 "A hora introducida non puido ser analizada." -#: ../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 "punto 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 "Personalizar debuxo de liñas" +#: ../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 "Usar configuración global." + #: ../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 "Usar configuración global." +msgid "Draw lines between points for this layer." +msgstr "Debuxar liñas entre puntos para esta capa." #: ../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 "Debuxar liñas entre puntos para esta capa." - -#: ../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 "Non debuxar liñas entre puntos para esta capa." -#: ../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 "Seleccionar as opcións de liña do debuxo" -#: ../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 "Personalizar Cor" -#: ../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 "Predeterminado" -#: ../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" @@ -6501,5 +7225,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}" @@ -6515,10 +7239,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 "Convertir en capa de datos" #: ../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." @@ -6529,11 +7253,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 @@ -6575,4 +7299,9 @@ "Desexas
continuar?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Descargando datos" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6593,64 +7322,64 @@ "correctamente os seus tempos foron omitidos." -#: ../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 "Capa de datos {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 "fora da área descargada" -#: ../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 "" -#: ../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 "" -#: ../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} composto de:" -#: ../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} borrados.)" -#: ../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 "" -#: ../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 "Convertir a capa 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" @@ -6658,5 +7387,5 @@ msgstr[1] "trazados" -#: ../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" @@ -6664,5 +7393,5 @@ msgstr[1] "puntos" -#: ../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" @@ -6671,5 +7400,5 @@ msgstr[1] "un trazado con {0} puntos" -#: ../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" @@ -6678,5 +7407,5 @@ msgstr[1] "{0} componse de {1} trazados" -#: ../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" @@ -6685,9 +7414,9 @@ msgstr[1] "{0} puntos" -#: ../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 "marca 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" @@ -6695,5 +7424,5 @@ msgstr[1] "marcas" -#: ../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" @@ -6713,5 +7442,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}." @@ -6719,5 +7448,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 "Non se pode sincronizar nunha capa en reproducción." @@ -6745,5 +7474,5 @@ msgstr "Cambiar o estado visible do texto e iconas da marca." -#: ../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 " @@ -6751,5 +7480,5 @@ msgstr "" -#: ../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 " @@ -6757,29 +7486,29 @@ msgstr "" -#: ../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 "Non se puido crear unha nova marca de audio." -#: ../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 "Houbo un erro tratando de amosar a URL desta marca." -#: ../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 "(a URL era: " -#: ../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 "Erro amosando a 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 "Preferencias avanzadas" -#: ../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 "Establecemento directo de entradas de preferencia. Usar con coidado!" -#: ../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 @@ -6787,27 +7516,27 @@ 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 "O valor actual é o predeterminado." -#: ../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 "O valor predeterminado é \"{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 "" "O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)." -#: ../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 "Por favor selecciona a fila a editar." -#: ../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 @@ -6815,14 +7544,14 @@ msgstr "Novo valor para {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 "Por favor seleccione a fila a borrar." -#: ../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 "Introduce un novo par clave/valor." @@ -6963,40 +7692,40 @@ msgstr "Calibración do grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Cor" -#: ../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 "Estilo de pintura {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 "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Escoller" -#: ../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 "Escolle unha cor para {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 "Establecer a predeterminado" -#: ../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 "Establecer todos ós predeterminados" -#: ../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 "Cores usadas por diferentes obxectos en JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Cores" @@ -7040,5 +7769,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Coche" @@ -7060,16 +7789,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 "Bicicleta" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7099,12 +7829,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 "Pé" @@ -7293,5 +8023,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 "Mostrar a pantalla de benvida ó iniciar" @@ -7299,23 +8029,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 "Amosar a ID do obxecto nas listas de selección" #: ../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 "Amosar a ID do obxecto nas listas de selección" + +#: ../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 "Traballando sen modo (estilo Potlach)" -#: ../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 "Amosar a ID do obxecto nas listas de selección" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Non requerir cambiar modos (flujo de trabajo estilo 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 "Apariencia e comportamento" @@ -7347,54 +8088,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 "Configurar os engadidos dispoñibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Descargar lista" -#: ../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 "Actualizar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Configurar sitios..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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 "Por favor selecciona unha entrada." +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Configurar os sitios dos engadidos" #. 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 "Preferencias de Visualización" -#: ../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 " @@ -7404,41 +8145,41 @@ "programa." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Preferencias de Conexión" -#: ../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 "Preferencias de conexión para o servidor 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 "Preferencias do Mapa" -#: ../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 "Parámetros para a proxección do mapa e interpretación de datos." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Preferencias de audio" -#: ../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 "Parámetros para o reproductor de audio e as marcas de audio." -#: ../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 "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos." -#: ../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 "Amosar coordenadas como" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Método de proxección" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Proxección do mapa" @@ -7471,12 +8212,4 @@ msgid "Proxy server password" msgstr "Contrasinal do servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "A URL base do servidor OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL Base do Servidor" #. 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 @@ -7503,61 +8236,60 @@ msgstr "Atallo" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Borrar da lista a fonte seleccionada." -#: ../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 "" @@ -7748,36 +8480,59 @@ msgstr "Grupos de modificadores" -#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Engadir nodo na vía" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Borrar a capa seleccionada." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Máis información acerca desta característica" #. 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 "Atributos Opcionais:" -#: ../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 "Usar ó axuste preestablecido \"{0}\" do grupo \"{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 "Usar axuste preestablecido \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "vía pechada" -#: ../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 "Tipo descoñecido: {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 @@ -7785,15 +8540,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {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 "Erro analizando {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 "Os elementos do tipo {0} están soportados." -#: ../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 @@ -7803,22 +8558,22 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../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 "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Cambiar Propiedades" -#: ../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}''" @@ -7857,11 +8612,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 "Non se puido ler \"{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 " @@ -7871,38 +8626,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 "Ficheiros GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "descripción de trazado gps" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Engadir información do autor" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nome real" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Predefinido" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Ano do Copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Palabras clave" @@ -7912,9 +8667,9 @@ msgstr "Opcións de exportacińo" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportar e Gardar" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7925,10 +8680,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 "Escoller unha licencia predefinida" -#: ../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 @@ -7938,12 +8693,12 @@ msgstr "Marcas de {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 "" -#: ../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" @@ -7964,6 +8719,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 @@ -7973,20 +8728,40 @@ msgstr "Descargando datos de 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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Non se engadiu nada á selección buscando por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7994,34 +8769,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Ficheiros 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 "Coordenadas importadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Sentencias mal formadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Erros de suma de verificación: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Sentencias descoñecidas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Coordenada cero: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Importación NMEA satisfactoria" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Fallo de importación NMEA!" @@ -8032,9 +8807,9 @@ msgstr "" -#: ../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 "Esta versión de JOSM é incompatible co servidor configurado." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8045,15 +8820,15 @@ "acepta {0} a {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 "Establecida a comunicación con {0} usando o protocolo da versión {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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8061,33 +8836,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." +msgstr "Pechando colección de cambios..." + +#: ../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 +#, java-format +msgid "Reusing existing changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Pechando colección de cambios..." + +#: ../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 "Pechando colección de cambios..." + +#: ../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 "Pechando colección de cambios..." -#: ../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 "Pechando colección de cambios..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Pechando colección de cambios..." + +#: ../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 "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Subindo..." -#: ../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}." @@ -8115,29 +8948,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Contrasinal ou nome de usuario incorrectos." -#: ../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 "Advertencia: O contrasinal transfírese sen encriptar." -#: ../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 "Gardar usuario e contrasinal (sen encriptar)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Introduce Contrasinal" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Inicio de sesión" -#: ../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 "A URL base do servidor OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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." @@ -8146,13 +8983,17 @@ "almacenar ningunha contrasinal." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL Base do Servidor" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "Contrasinal 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." @@ -8161,20 +9002,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Ficheiros de Servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8183,5 +9024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8376,35 +9217,46 @@ "internet." -#: ../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} restantes. Subindo {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} restantes. Subindo {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} restantes. Subindo {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 "Nada que subir. Consigue algún dato antes." + +#: ../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 "Actualizar Engadidos" -#: ../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 "Descargar Engadidos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8417,5 +9269,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." @@ -8424,23 +9276,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8451,30 +9303,30 @@ msgstr "Ocurriu un erro no engadido {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 "" -#: ../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 "O engadido {0} foi requerida polo engadido {1} pero non se atopou." -#: ../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 "Engadido non atopado: {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 "A última actualización de engadidos foi fai máis de {0} días." -#: ../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 " @@ -8485,21 +9337,21 @@ "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 "Desactivar engadido" -#: ../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 "Non se puido cargar o engadido {0}. Borrar das preferencias?" -#: ../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 " @@ -8509,5 +9361,5 @@ "permisos para sobrescribir os existentes." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8516,10 +9368,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{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 "Dacordo coa información contida no engadido, o autor é {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." @@ -8528,9 +9380,9 @@ "dun fallo." -#: ../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 "Debería ser desactivado o engadido?" -#: ../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 " @@ -8538,13 +9390,13 @@ msgstr "" -#: ../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" @@ -8555,5 +9407,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" @@ -8562,18 +9414,18 @@ msgstr[1] "Descargada información de engadidos de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Non se atopou información de engadidos." -#: ../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 "" -#: ../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 "Todos os engadidos instalados estan actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8586,9 +9438,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 "Descargar engadidos perdidos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8601,35 +9453,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}: Versión {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 "Engadido empaquetado con 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 "Erro lendo o ficheiro de informaclión de engadido: {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 "Isto está despois do fin da grabación" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Erro reproducindo son" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Non facer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Informar de Fallo" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8644,18 +9496,18 @@ "erro." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Excepción Inesperada" +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#, java-format +msgid "Please report a ticket at {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 -#, java-format -msgid "Please report a ticket at {0}" +msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 -msgid "Include your steps to get to the error (as detailed as possible)!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8663,13 +9515,13 @@ msgstr "" -#: ../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 "Asegúrate de incluir a seguinte información:" -#: ../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 "(O texto xa foi copiado ao teu portapapeis.)" -#: ../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}." @@ -8677,6 +9529,6 @@ "Non se puido atopar traducción para a localización {0}. Volvendo a {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 "" @@ -8685,5 +9537,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8692,5 +9544,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8700,5 +9552,5 @@ msgstr "" -#: ../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" @@ -8706,5 +9558,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8713,21 +9565,56 @@ msgstr "" -#: ../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 "(Consello: Pode editar os atallos nas preferencias.)" -#: ../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 "" @@ -8754,9 +9641,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 @@ -8764,27 +9669,40 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Público" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in 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}" @@ -8792,47 +9710,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 "Conectando..." -#: ../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 "Subida de datos cancelada" -#: ../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 "Error durante a subida de datos" -#: ../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 "A subida do GPX tivo éxito" -#: ../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 "Subindo trazado GPX: {0}% ({1} de {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 "" -#: ../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 "" @@ -8945,19 +9863,19 @@ msgstr "Cargar conxunto de imaxes como unha nova capa" -#: ../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 "Ficheiros 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 "O ficheiro {0} cárgase baixo o nome \"{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 "Erro durante a análise {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." @@ -8966,34 +9884,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -9001,69 +9919,69 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -9072,9 +9990,9 @@ msgstr "" -#: ../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 "" @@ -9083,65 +10001,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -9149,13 +10067,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valores Predeterminados" @@ -9176,5 +10094,5 @@ msgstr "Erro no ficheiro {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9187,12 +10105,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 "Seleccionar Todo" - -#: ../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 "Erro cargando ficheiro" @@ -9223,6 +10140,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9231,21 +10148,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" @@ -9254,37 +10171,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 "" -#: ../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." @@ -9296,18 +10224,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9315,5 +10243,5 @@ msgstr "" -#: ../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). " @@ -9321,41 +10249,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. 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 "Multiplicador de avance rápido" - -#: ../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 "" -#: ../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 "" -#: ../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 "Multiplicador de avance rápido" - -#: ../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 "" @@ -9413,12 +10339,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contactando co servidor OSM..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "A primitiva xa foi borrada" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9452,20 +10376,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" @@ -9473,9 +10397,14 @@ 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 +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" @@ -9483,29 +10412,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "Pegar" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -msgid "North" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Coordenada cero: " +msgid "Set " +msgstr "Seleccionar" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9567,6 +10506,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)" @@ -9588,6 +10527,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 "" @@ -9603,7 +10542,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Capas: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10125,6 +11064,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 "" @@ -10136,8 +11075,4 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 msgid "land" -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" msgstr "" @@ -10421,9 +11356,9 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10432,5 +11367,5 @@ msgstr "" -#: ../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 "" @@ -10989,5 +11924,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 "" @@ -11006,29 +11941,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 "" @@ -11042,23 +11977,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 "" -#: ../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" @@ -11067,38 +11994,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -11106,81 +12033,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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?" @@ -11190,25 +12117,25 @@ msgstr[1] "" -#: ../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 "" @@ -11295,53 +12222,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" @@ -11366,20 +12293,49 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +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 +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 "Duplicar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 "Borrar nodos ou vías." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11462,23 +12418,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11489,7 +12445,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 "" @@ -11497,80 +12453,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11578,83 +12534,83 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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:711 +msgid "Check property values." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Usar ficheiro de datos por defecto." -#: ../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 "Usar o ficheiro de datos por defecto (recomendado)." +#: ../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 "Usar ficheiro de comprobación ortográfica predeterminado." -#: ../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 "" "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)." -#: ../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 "" -#: ../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}''" @@ -11799,7 +12755,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 "" @@ -11813,5 +12769,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 "" @@ -11947,5 +12903,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11990,14 +12946,14 @@ msgstr "" -#: ../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}" @@ -12008,26 +12964,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 "" -#: ../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 "" -#: ../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 " @@ -12035,37 +12991,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -12078,104 +13052,141 @@ 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 +msgid "(deactivated)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 +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" msgstr "" -#: ../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 "Gardar capa WMS nun ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Cargar capa WMS dende ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 msgid "WMS" msgstr "" -#: ../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 "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Nome de Menú (Predeterminado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "URL WMS (Predeterminada)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Copiar Predeterminado" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Por favor, selecciona polo menos unha vía." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12536,61 +13547,6 @@ #: 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 "" @@ -12606,5 +13562,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 "" @@ -12619,5 +13575,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" @@ -12627,10 +13582,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 "" @@ -12674,9 +13629,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 "" @@ -12724,13 +13679,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 "" @@ -12772,13 +13727,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 "" @@ -12818,12 +13773,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 "" @@ -12863,12 +13818,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 "" @@ -13024,17 +13979,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 "" @@ -13061,4 +14016,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" @@ -13077,11 +14033,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 "" @@ -13091,4 +14048,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" @@ -13103,9 +14061,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 "" @@ -13113,9 +14072,70 @@ #: 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 +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 "Correo Electrónico" + +#. 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 +msgid "paving_stones" msgstr "" @@ -13124,11 +14144,92 @@ #: 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 "selección" + +#: 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 "incompleto" + +#: 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 +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 "" @@ -13210,20 +14311,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 "" @@ -13236,8 +14337,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 "" @@ -13272,32 +14373,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 "" @@ -13310,40 +14426,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 "" @@ -13356,19 +14472,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 "" @@ -13391,65 +14507,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13464,10 +14585,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 "" @@ -13483,17 +14604,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" @@ -13505,30 +14625,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 "" @@ -13536,25 +14656,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 "" @@ -13565,5 +14685,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 "" @@ -13579,5 +14699,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" #. @@ -13585,9 +14705,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 "" @@ -13607,10 +14727,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 "" @@ -13632,10 +14752,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 "" @@ -13657,10 +14777,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 "" @@ -13682,5 +14802,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" @@ -13695,9 +14815,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 "" @@ -13711,9 +14831,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 "" @@ -13743,10 +14863,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 "" @@ -13776,6 +14896,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 "" @@ -13786,10 +14906,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 "" @@ -13797,19 +14917,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 "" @@ -13825,5 +14945,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "" @@ -13832,5 +14952,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13838,5 +14958,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13844,5 +14964,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "" @@ -13852,11 +14972,16 @@ #. 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 +msgid "Pedestrians" msgstr "" #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "" @@ -13865,11 +14990,16 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" +msgstr "" + +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +msgid "Bikes" msgstr "" #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "" @@ -13878,5 +15008,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "" @@ -13884,5 +15014,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "" @@ -13892,5 +15022,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 "" @@ -13899,5 +15029,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13906,39 +15036,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 "" @@ -13947,5 +15049,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13953,5 +15055,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13960,5 +15062,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13966,5 +15068,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13973,5 +15075,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13979,5 +15081,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13986,5 +15088,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13992,5 +15094,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13999,5 +15101,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -14006,5 +15108,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "" @@ -14013,19 +15115,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 "" @@ -14035,5 +15140,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 "" @@ -14041,5 +15146,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -14049,5 +15154,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 "" @@ -14055,5 +15160,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -14063,5 +15168,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 "" @@ -14069,5 +15174,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -14077,5 +15182,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 "" @@ -14083,5 +15188,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -14091,5 +15196,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 "" @@ -14097,5 +15202,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -14105,5 +15210,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 "" @@ -14111,10 +15216,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 "" @@ -14122,15 +15227,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 "" @@ -14138,5 +15243,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -14150,4 +15255,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" #. @@ -14167,18 +15274,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 "" @@ -14187,5 +15296,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "" @@ -14195,5 +15304,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -14202,27 +15311,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 "" @@ -14230,6 +15339,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 "" @@ -14238,11 +15347,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 "" @@ -14250,30 +15359,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 "" @@ -14281,5 +15390,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14288,14 +15397,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14306,14 +15415,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 "" @@ -14323,20 +15432,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 "" @@ -14344,5 +15453,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "" @@ -14350,5 +15459,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14356,5 +15465,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14363,10 +15472,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 "" @@ -14374,5 +15483,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14380,5 +15489,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14386,11 +15495,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 "" @@ -14398,5 +15507,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "" @@ -14404,5 +15513,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14410,5 +15519,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14453,16 +15562,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 "" @@ -14471,5 +15580,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14477,5 +15586,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14483,10 +15592,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 "" @@ -14494,15 +15603,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 "" @@ -14510,5 +15619,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "" @@ -14516,10 +15625,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 "" @@ -14529,5 +15638,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14536,5 +15645,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14543,5 +15652,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "" @@ -14549,5 +15658,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "" @@ -14556,5 +15665,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14566,15 +15675,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 "" @@ -14582,50 +15691,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 "" @@ -14633,25 +15742,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 "" @@ -14662,10 +15771,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 "" @@ -14673,5 +15782,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "" @@ -14679,5 +15788,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14685,10 +15794,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 "" @@ -14696,10 +15805,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 "" @@ -14707,10 +15816,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 "" @@ -14720,5 +15829,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 "" @@ -14726,15 +15835,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 "" @@ -14742,15 +15851,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 "" @@ -14758,15 +15867,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 "" @@ -14774,5 +15883,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "" @@ -14781,10 +15890,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 "" @@ -14795,14 +15904,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 "" @@ -14816,35 +15925,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 "" @@ -14852,20 +15961,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 "" @@ -14873,10 +15982,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 "" @@ -14884,5 +15993,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "" @@ -14890,5 +15999,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "" @@ -14896,5 +16005,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14903,5 +16012,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14909,10 +16018,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 "" @@ -14920,5 +16029,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14926,5 +16035,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "" @@ -14932,15 +16041,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 "" @@ -14949,5 +16058,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14955,20 +16064,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 "" @@ -14977,15 +16086,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 "" @@ -14993,10 +16102,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 "" @@ -15004,10 +16113,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 "" @@ -15017,5 +16126,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 "" @@ -15023,10 +16132,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 "" @@ -15034,5 +16143,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -15062,8 +16171,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 "" @@ -15077,35 +16186,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 "" @@ -15113,45 +16222,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 "" @@ -15159,5 +16268,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15166,14 +16275,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 "" @@ -15182,5 +16291,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15189,5 +16298,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15197,5 +16306,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15203,5 +16312,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15210,10 +16319,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 "" @@ -15221,10 +16330,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 "" @@ -15232,10 +16341,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 "" @@ -15243,10 +16352,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 "" @@ -15254,5 +16363,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15260,5 +16369,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 "" @@ -15269,10 +16378,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 "" @@ -15282,9 +16391,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" @@ -15304,47 +16642,73 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" +#. 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:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 +#: build/trans_presets.java:1393 +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 +msgid "Capacity (overall)" +msgstr "" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 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 +#: build/trans_presets.java:1398 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "" @@ -15352,5 +16716,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "" @@ -15358,15 +16722,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "" @@ -15374,5 +16738,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "" @@ -15381,10 +16745,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "" @@ -15392,5 +16756,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "" @@ -15398,6 +16762,11 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" +msgstr "" + +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" msgstr "" @@ -15405,5 +16774,5 @@ #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "" @@ -15412,15 +16781,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 "" @@ -15428,5 +16797,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15434,5 +16803,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15440,5 +16809,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -15447,5 +16816,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -15453,5 +16822,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -15460,5 +16829,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -15470,5 +16839,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 "" @@ -15476,10 +16845,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 "" @@ -15488,10 +16857,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 "" @@ -15500,5 +16869,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "" @@ -15507,5 +16876,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "" @@ -15513,5 +16882,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -15521,5 +16890,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 "" @@ -15528,8 +16897,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 "" @@ -15537,10 +16904,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 "" @@ -15548,5 +16915,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "" @@ -15554,5 +16921,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "" @@ -15560,5 +16927,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "" @@ -15566,15 +16933,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 "" @@ -15583,5 +16950,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "" @@ -15593,5 +16960,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -15600,15 +16967,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 "" @@ -15616,20 +16983,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 "" @@ -15637,10 +17004,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 "" @@ -15648,30 +17015,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 "" @@ -15679,10 +17046,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 "" @@ -15693,5 +17060,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -15699,5 +17066,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "" @@ -15705,5 +17072,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 "" @@ -15711,61 +17078,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 "" @@ -15773,9 +17140,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 "" @@ -15783,10 +17150,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 "" @@ -15794,20 +17160,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 "" @@ -15815,10 +17179,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 "" @@ -15826,33 +17189,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 "" @@ -15860,10 +17214,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 "" @@ -15872,10 +17225,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 "" @@ -15883,25 +17235,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 "" @@ -15909,5 +17260,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "" @@ -15915,86 +17266,203 @@ #. 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 "Mapa" #. 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 "ata" + +#. 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 +msgid "scheme" +msgstr "" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Área de Descarga" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Pegar" + +#: build/trans_presets.java:1721 +msgid "city" +msgstr "" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "relación" #. 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 +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 +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 +msgid "Board Content" +msgstr "" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "nodo" + +#: 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 +msgid "plants" +msgstr "" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Información" + +#. 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 "descripción de trazado gps" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: build/trans_presets.java:1775 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" +#: build/trans_presets.java:1776 +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 "" @@ -16002,25 +17470,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 "" @@ -16029,20 +17497,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 "" @@ -16051,10 +17518,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 "" @@ -16062,5 +17528,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "" @@ -16068,15 +17534,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 "" @@ -16084,45 +17550,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 "" @@ -16130,15 +17596,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 "" @@ -16146,15 +17612,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 "" @@ -16168,6 +17634,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 "" @@ -16559,30 +18025,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 "" @@ -16592,227 +18058,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 "" @@ -16851,248 +18315,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "" @@ -17100,178 +18556,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 "" @@ -17279,5 +18735,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "" @@ -17285,10 +18741,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 "" @@ -17296,10 +18752,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 "" @@ -17307,10 +18763,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 "" @@ -17319,10 +18775,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 "" @@ -17331,10 +18787,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 "" @@ -17344,10 +18800,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 "" @@ -17356,10 +18812,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 "" @@ -17367,5 +18823,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "" @@ -17373,15 +18829,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 "" @@ -17389,10 +18845,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 "" @@ -17400,10 +18856,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 "" @@ -17411,5 +18867,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "" @@ -17417,5 +18873,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "" @@ -17424,10 +18880,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 "" @@ -17436,10 +18892,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 "" @@ -17447,10 +18902,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 "" @@ -17459,10 +18914,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 "" @@ -17472,5 +18927,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 "" @@ -17479,6 +18934,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 "" @@ -17487,66 +18942,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 "" @@ -17555,81 +19010,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 "" @@ -17638,5 +19093,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "" @@ -17644,5 +19099,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "" @@ -17650,20 +19105,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 "" @@ -17671,5 +19126,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "" @@ -17678,5 +19133,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "" @@ -17684,71 +19139,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 "" @@ -17756,10 +19207,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 "" @@ -17767,10 +19218,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 "" @@ -17778,10 +19229,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 "" @@ -17791,10 +19242,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 "" @@ -17802,10 +19253,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 "" @@ -17813,10 +19264,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 "" @@ -17824,10 +19275,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 "" @@ -17835,5 +19286,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "" @@ -17841,5 +19292,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "" @@ -17849,39 +19300,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 "" @@ -17890,10 +19341,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 "" @@ -17902,5 +19353,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "" @@ -17908,10 +19359,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 "" @@ -17922,5 +19373,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 "" @@ -17928,5 +19379,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "" @@ -17935,46 +19386,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 "" @@ -17983,5 +19428,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "" @@ -17989,5 +19434,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 "" @@ -17995,5 +19440,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 "" @@ -18001,5 +19446,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 "" @@ -18007,5 +19452,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 "" @@ -18013,15 +19458,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 "" @@ -18030,5 +19475,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "" @@ -18036,80 +19481,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 "" @@ -18118,10 +19559,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 "" @@ -18130,10 +19571,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 "" @@ -18141,25 +19582,33 @@ #. 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 +msgid "Chemist" +msgstr "" + +#. item +#: build/trans_presets.java:2473 +msgid "Edit Chemist" +msgstr "" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "" @@ -18167,10 +19616,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 "" @@ -18178,10 +19626,27 @@ #. 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 +msgid "Edit Book Store" +msgstr "" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +msgid "Edit Travel Agency" +msgstr "" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "" @@ -18189,5 +19654,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "" @@ -18195,88 +19660,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 "" -#: 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 "" @@ -18284,10 +19749,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 "" @@ -18295,10 +19759,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 "" @@ -18306,20 +19769,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 "" @@ -18327,60 +19788,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 "" @@ -18388,10 +19843,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 "" @@ -18399,10 +19853,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 "" @@ -18410,60 +19863,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 "" @@ -18471,10 +19918,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 "" @@ -18482,10 +19928,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 "" @@ -18493,35 +19938,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 "" @@ -18529,16 +19971,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 "" @@ -18546,5 +19986,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "" @@ -18552,15 +19992,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 "" @@ -18568,20 +20008,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 "" @@ -18589,5 +20027,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "" @@ -18595,10 +20033,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 "" @@ -18606,10 +20043,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 "" @@ -18618,5 +20055,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18625,20 +20062,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 "" @@ -18646,5 +20083,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 "" @@ -18653,55 +20090,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 "" @@ -18709,15 +20146,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "" #. 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 "" @@ -18725,10 +20162,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 "" @@ -18736,25 +20173,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 "" @@ -18762,5 +20199,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18768,10 +20205,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 "" @@ -18779,11 +20216,23 @@ #. 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 "esquerda" + +#. item +#. +#: build/trans_presets.java:2825 +msgid "Edit Islet" +msgstr "" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "" @@ -18791,10 +20240,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 "" @@ -18802,10 +20251,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 "" @@ -18813,10 +20262,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 "" @@ -18824,70 +20273,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 "" @@ -18896,15 +20345,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 "" @@ -18913,5 +20362,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "" @@ -18919,17 +20368,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 "" @@ -18938,14 +20387,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 "" @@ -18953,25 +20402,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 "" @@ -18979,10 +20428,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 "" @@ -18990,5 +20439,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "" @@ -18996,5 +20445,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -19003,45 +20452,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 "" @@ -19049,25 +20498,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 "" @@ -19075,10 +20524,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 "" @@ -19086,20 +20535,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 "" @@ -19107,5 +20556,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -19113,15 +20562,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 "" @@ -19129,9 +20578,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 "" @@ -19139,39 +20588,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 "" @@ -19179,15 +20628,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 "" @@ -19195,55 +20644,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 "" @@ -19253,5 +20702,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 "" @@ -19260,10 +20709,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 "" @@ -19271,5 +20720,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19278,5 +20727,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19284,34 +20733,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 "" @@ -19320,15 +20769,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 "" @@ -19336,5 +20785,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19343,5 +20792,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19349,5 +20798,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19419,5 +20868,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 @@ -19426,17 +20875,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 "" @@ -19489,5 +20938,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 @@ -19496,13 +20945,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 "" @@ -19516,10 +20965,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 "" @@ -19527,31 +20976,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 "" @@ -19560,30 +21009,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 "" @@ -20021,11 +21470,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 "" @@ -20350,41 +21799,4 @@ #: build/trans_style.java:542 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 "" @@ -22086,5 +23498,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 "" @@ -22683,55 +24095,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22745,5 +24108,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 "" @@ -22815,8 +24178,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 "" @@ -22887,8 +24250,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 "" @@ -22902,5 +24265,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "" @@ -22914,5 +24277,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22934,5 +24297,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22946,5 +24309,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "" @@ -22958,5 +24321,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22979,5 +24342,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22991,5 +24354,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "" @@ -23003,5 +24366,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -23015,5 +24378,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -23027,5 +24390,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -23082,7 +24445,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 "" @@ -23096,5 +24459,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "" @@ -23107,5 +24470,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "" @@ -23120,5 +24483,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "" @@ -23132,5 +24495,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "" @@ -23185,8 +24548,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 "" @@ -23200,5 +24563,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23212,18 +24575,6 @@ #. #. -#: 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 "" @@ -23236,5 +24587,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "" @@ -23248,5 +24599,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "" @@ -23324,8 +24675,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 "" @@ -23373,7 +24724,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 "" @@ -23515,10 +24866,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 "" @@ -23566,6 +24926,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 "" @@ -23862,4 +25222,45 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. " +#~ "Por favor, informa disto como un erro." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Non hai documentos abertos, polo que non hai nada que gardar." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Borrar {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Non se pode abrir o directorio de preferencias: {0}" + +#~ msgid "nodes" +#~ msgstr "nodos" + +#~ msgid "ways" +#~ msgstr "vías" + +#~ msgid "relations" +#~ msgstr "relacións" + +#~ msgid "Delete Layer" +#~ msgstr "Borrar Capa" + +#~ msgid "Authors: {0}" +#~ msgstr "Autores: {0}" + +#~ msgid "Public" +#~ msgstr "Público" + #~ msgid "" #~ "Server returned internal error. Try a reduced area or retry after waiting " @@ -23937,7 +25338,4 @@ #~ "Revertir o estado de todos os obxectos seleccionados actualmenete á " #~ "versión seleccionada na lista do historial." - -#~ msgid "Not implemented yet." -#~ msgstr "Ainda sen implementar." #~ msgid "Login name (email) to the OSM account." @@ -24042,7 +25440,4 @@ #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Algúns dos nodos están (case) na liña" - -#~ msgid "Email" -#~ msgstr "Correo Electrónico" #~ msgid "" @@ -24168,7 +25563,4 @@ #~ msgstr "Conflitos: {0}" -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolver Conflitos" - #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr "" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 17484) +++ /applications/editors/josm/i18n/po/he.po (revision 17485) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" "PO-Revision-Date: 2009-08-04 10:56+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 @@ -96,154 +99,160 @@ #: ../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] "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?" + +#: ../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 "מתעלם מ-URL לא תקין: \"{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 "מתעלם מ-URL לא תקין לקובץ: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "תוספים" @@ -344,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -359,5 +376,5 @@ msgstr "" -#: ../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 "" @@ -367,11 +384,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -380,5 +397,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 "" @@ -395,11 +412,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 @@ -428,5 +445,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 "קו רוחב" @@ -435,30 +452,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 @@ -472,6 +489,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 @@ -479,58 +496,57 @@ 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 "" @@ -539,10 +555,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -551,5 +567,5 @@ msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -560,46 +576,46 @@ "הערך הוא {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 "" -#: ../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 @@ -609,22 +625,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 "נא בחר לפחות שתי דרכים לשילוב." @@ -635,4 +651,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 " @@ -640,13 +660,13 @@ msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +msgid "Reverse and Combine" +msgstr "הפוך כיוון ואחד" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -654,31 +674,26 @@ msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -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: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 " @@ -686,32 +701,32 @@ msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -721,20 +736,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 "מחק" @@ -744,85 +759,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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -831,6 +847,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 "שכפל" @@ -854,85 +870,91 @@ 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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "עזרה מקוונת עבור 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 בלבד" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -984,22 +1006,26 @@ 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 " @@ -1008,77 +1034,73 @@ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?" -#: ../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 "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "לא ניתן להזיז פריטים אל מחוץ לעולם." @@ -1086,5 +1108,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 "חדש" @@ -1094,16 +1116,21 @@ 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}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "פתח קובץ." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, java-format +msgid "Opening file ''{0}'' ..." msgstr "" @@ -1142,21 +1169,17 @@ msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות" -#: ../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 "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות" -#: ../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 " @@ -1165,9 +1188,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 "יישר" @@ -1183,13 +1206,26 @@ 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}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1215,37 +1251,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 "" +#: ../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 "הפוך דרכים" @@ -1253,10 +1284,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 "שמור את הנתונים הנוכחיים." @@ -1267,36 +1299,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 " @@ -1306,28 +1327,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 "שמור את המידע הנוכחי לקובץ חדש." @@ -1359,33 +1380,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." @@ -1393,5 +1414,5 @@ msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך." -#: ../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 " @@ -1403,9 +1424,9 @@ msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך." -#: ../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." @@ -1413,10 +1434,10 @@ msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות." -#: ../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 " @@ -1424,5 +1445,5 @@ msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)" -#: ../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 " @@ -1430,5 +1451,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 " @@ -1436,8 +1457,32 @@ 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 +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 @@ -1455,56 +1500,56 @@ msgstr "" +#: ../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:121 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 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." msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת." -#: ../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" @@ -1514,9 +1559,9 @@ msgstr "" -#: ../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" @@ -1524,5 +1569,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" @@ -1566,61 +1611,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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "" @@ -1634,17 +1689,17 @@ msgstr "" -#: ../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 "" @@ -1655,32 +1710,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "העלאה ל-API של OSM נכשלה" -#: ../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 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1688,31 +1781,79 @@ 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 +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] "פריטים להוספה:" + +#: ../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] "פריטים לשינוי:" + +#: ../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] "פריטים למחיקה:" + +#: ../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 @@ -1736,20 +1877,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 "הרצה מהירה" @@ -1791,10 +1932,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 "הרצה איטית יותר" @@ -1822,31 +1963,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 "" @@ -1858,20 +1995,20 @@ msgstr "" -#: ../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 @@ -1880,5 +2017,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 " @@ -1888,55 +2025,69 @@ "דרך. Ctrl: מחק פריטים מפנים." -#: ../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 "" +#: ../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 @@ -1944,38 +2095,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." @@ -1984,14 +2135,14 @@ msgstr[1] "הוסף נקודה חדשה ל-{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 "הפסק לצייר." @@ -2011,5 +2162,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 "שחרר את לחצן העכבר לבחירת פריטים במרובע." @@ -2020,5 +2171,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 "שחרר את סמן העכבר להפסקת ההטייה" @@ -2036,17 +2187,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" @@ -2055,25 +2207,29 @@ msgstr[1] "" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." @@ -2081,5 +2237,5 @@ "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר." -#: ../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-" @@ -2102,60 +2258,60 @@ msgstr "" +#: ../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 "רחוב אבג-'רחוב' ו'אבג' בכל מפתח או שם." -#: ../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 "\"רחוב אבג\"-'רחוב אבג' בכל מפתח או שם." -#: ../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:אבג-'אבג' איפשהו בשם." -#: ../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, " @@ -2165,109 +2321,110 @@ "*=*, *=" -#: ../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:אבג-ללא 'אבג' בשם." -#: ../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:-מפתח '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:-סוג העצם (נקודה, דרך, יחס)" -#: ../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 "nodes:...-עצמים עם מספר הנקודות הנתון" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "" - -#: ../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 "untagged - כל העצמים הלא מתוייגים" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "השתמש ב-| או OR כדי לחבר ב\"או\" לוגי" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "השתמש ב-( ו ) כדי לצרף ביטויים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/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" @@ -2331,58 +2488,96 @@ msgstr "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../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 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../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}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "שינוי אחרון ב {0}" + +#: ../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" @@ -2391,10 +2586,10 @@ msgstr[1] "עצמים" -#: ../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}" @@ -2406,5 +2601,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2413,10 +2608,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2425,5 +2620,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}''" @@ -2447,40 +2642,56 @@ 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}" + +#: ../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] "מצב מחיקה" + +#: ../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}" + +#: ../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] "מחק מיחס" + +#: ../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?" -msgstr "" - -#: ../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 +#: ../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:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "פצל קטע דרך" @@ -2488,6 +2699,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." @@ -2498,5 +2709,5 @@ "אחרים {שאתה לא רואה) עשויים להשתמש בהם.
האם אתה באמת רוצה למחוק?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2507,5 +2718,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2540,10 +2751,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2556,17 +2777,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 "" -#: ../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}" @@ -2591,13 +2832,13 @@ msgstr "" -#: ../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 "תפקיד חדש" @@ -2616,62 +2857,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 "" @@ -2685,29 +2983,36 @@ msgstr "" -#: ../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}" @@ -2719,15 +3024,229 @@ msgstr "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "" + +#: ../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" @@ -2736,22 +3255,7 @@ msgstr[1] "צמתים" -#: ../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" @@ -2760,12 +3264,7 @@ msgstr[1] "דרכים" -#: ../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" @@ -2774,246 +3273,4 @@ msgstr[1] "יחסים" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "חבר {0}" -msgstr[1] "{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} נקודות" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "" - -#: ../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" @@ -3026,5 +3283,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "רקע" @@ -3034,5 +3291,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3042,5 +3299,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3051,21 +3308,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "מרקטור" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3086,8 +3343,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3095,15 +3352,101 @@ #: ../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/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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "" + +#: ../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} נקודות" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "חבר {0}" +msgstr[1] "{0} חברים" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "" @@ -3113,36 +3456,9 @@ msgstr "" -#: ../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 "" @@ -3152,9 +3468,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 "" @@ -3163,9 +3479,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3174,9 +3490,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 "" @@ -3186,9 +3513,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 "" @@ -3198,11 +3525,6 @@ msgstr "" -#: ../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 "" @@ -3220,38 +3542,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 "" -#: ../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 " @@ -3261,5 +3583,5 @@ "שם קובץ" -#: ../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 " @@ -3269,5 +3591,5 @@ "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 " @@ -3277,75 +3599,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 "" -#: ../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 "" -#: ../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" @@ -3353,47 +3694,47 @@ msgstr "" -#: ../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 "" -#: ../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." msgstr "" -#: ../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 @@ -3405,21 +3746,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 "שמע" @@ -3459,58 +3800,44 @@ 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 "" - -#: ../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 "" @@ -3522,10 +3849,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 "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3584,7 +3905,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" @@ -3600,5 +3920,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" @@ -3701,5 +4021,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 "הגירסה שלי" @@ -3710,5 +4030,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" @@ -3722,5 +4042,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 "הגירסה שלהם" @@ -3803,6 +4123,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" @@ -3912,10 +4232,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 "אינדקס טור לא צפוי. התקבל {0}" -#: ../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 "" @@ -3924,19 +4244,19 @@ msgstr "" -#: ../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 "" @@ -3945,5 +4265,5 @@ msgstr "" -#: ../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 "בטל מחיקת נקודות נוספות?" @@ -3961,9 +4281,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 " @@ -3971,110 +4291,112 @@ 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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4083,21 +4405,21 @@ msgstr "" -#: ../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 "" @@ -4136,10 +4458,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 @@ -4148,10 +4471,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 @@ -4165,5 +4489,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}" @@ -4204,4 +4528,140 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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} דרכים" + +#: ../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] "יחס" +msgstr[1] "יחסים" + +#: ../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} דרכים" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4217,10 +4677,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 @@ -4228,5 +4688,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}" @@ -4257,36 +4717,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 "" @@ -4298,150 +4752,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 "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "" - -#: ../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 "" - -#: ../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." @@ -4450,28 +4872,22 @@ msgstr[1] "זה ישנה עד {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" @@ -4480,89 +4896,84 @@ msgstr[1] "שנה תכונות של עד {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 "מחק מאפיינים" @@ -4571,34 +4982,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 "" @@ -4631,23 +5042,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} דרכים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "יחס" -msgstr[1] "יחסים" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4655,78 +5052,105 @@ 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." msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." -#: ../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] "מחבר" + +#: ../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 +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 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "" @@ -4735,47 +5159,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 " @@ -4784,14 +5202,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 "" @@ -4801,9 +5219,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 "" @@ -4813,15 +5231,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4829,5 +5247,5 @@ msgstr "" -#: ../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 " @@ -4835,20 +5253,20 @@ msgstr "" -#: ../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 "" @@ -4857,57 +5275,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 " @@ -4916,9 +5334,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 "" @@ -4927,20 +5345,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 @@ -4950,37 +5364,37 @@ msgstr "אישור" -#: ../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 "" @@ -4990,30 +5404,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 "" @@ -5027,22 +5441,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 "" @@ -5075,34 +5494,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] "" -msgstr[1] "" - -#: ../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 "בחר סימניה תחילה." @@ -5157,13 +5563,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 "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת" @@ -5171,18 +5577,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 "שם" @@ -5221,37 +5626,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: " @@ -5260,5 +5665,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 "" @@ -5285,46 +5690,74 @@ msgstr "מספרי משטחים" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5643,14 +6076,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5826,8 +6273,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" #. @@ -5924,4 +6377,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6035,6 +6491,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 @@ -6042,153 +6498,171 @@ #: 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 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../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 @@ -6197,32 +6671,285 @@ msgstr "" -#: ../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 +#, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 +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 @@ -6230,29 +6957,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" @@ -6261,14 +6988,14 @@ msgstr[1] "תמונות" -#: ../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 @@ -6276,82 +7003,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/dd/yyyy HH:MM:SS)" -#: ../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" @@ -6411,5 +7138,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}" @@ -6425,10 +7152,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." @@ -6439,11 +7166,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 @@ -6485,4 +7212,9 @@ "html>" +#: ../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." @@ -6503,64 +7235,64 @@ "באופן הגיוני הושמטו." -#: ../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 "" -#: ../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" @@ -6568,5 +7300,5 @@ msgstr[1] "מסלולים" -#: ../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" @@ -6574,5 +7306,5 @@ msgstr[1] "נקודות" -#: ../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" @@ -6581,5 +7313,5 @@ msgstr[1] "מסלול בעל {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" @@ -6588,5 +7320,5 @@ msgstr[1] "{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" @@ -6595,9 +7327,9 @@ msgstr[1] "{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" @@ -6605,5 +7337,5 @@ msgstr[1] "סמנים" -#: ../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" @@ -6622,5 +7354,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}." @@ -6628,5 +7360,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 "" @@ -6654,5 +7386,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 " @@ -6660,5 +7392,5 @@ msgstr "" -#: ../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 " @@ -6666,29 +7398,29 @@ msgstr "" -#: ../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 "היתה שגיאה בניסיון להציג את הכתובת לסמן זה" -#: ../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 @@ -6696,26 +7428,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 @@ -6723,14 +7455,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 "הכנס צמד מפתח\\ערך חדש" @@ -6853,40 +7585,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 "" -#: ../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 "צבעים" @@ -6930,5 +7662,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "רכב" @@ -6950,16 +7682,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:" #. @@ -6989,12 +7722,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 "רגל" @@ -7165,5 +7898,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 "הצג מסך פתיחה בפתיחה" @@ -7171,23 +7904,32 @@ #. 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 "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +msgid "Show localized name in selection lists" +msgstr "" + +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +msgid "Show localized name in selection lists, if available" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "מראה ומרגש" @@ -7219,54 +7961,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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 " @@ -7274,41 +8016,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 "הטלת מפה" @@ -7341,12 +8083,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 "" - -#: ../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 @@ -7373,61 +8107,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7593,36 +8326,59 @@ 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] "" +msgstr[1] "" + +#: ../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 "" -#: ../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 "" -#: ../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 @@ -7630,15 +8386,15 @@ msgstr "" -#: ../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 "" -#: ../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 @@ -7648,22 +8404,22 @@ msgstr[1] "שנה {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}''" @@ -7702,11 +8458,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 " @@ -7714,38 +8470,38 @@ msgstr "הערה: GPL אינו תואם לרשיון של OSM. אל תעלה מסלולים שרשיונם 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 "קבצי GPX" -#: ../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 "" -#: ../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 "מילות מפתח" @@ -7755,9 +8511,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 "" @@ -7768,10 +8524,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 @@ -7781,12 +8537,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 "" -#: ../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" @@ -7807,6 +8563,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 @@ -7816,20 +8572,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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 " @@ -7837,34 +8613,34 @@ msgstr "" -#: ../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 "שגיאות Checksum: " -#: ../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 נכשל!" @@ -7875,9 +8651,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7886,15 +8662,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7902,33 +8678,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." +msgstr "מכין נתונים..." + +#: ../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 +#, java-format +msgid "Reusing existing changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +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 "שינוי אחרון ב {0}" + +#: ../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 "צור קשר עם {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, 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}." @@ -7956,42 +8789,50 @@ msgstr "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "" -#: ../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." @@ -8000,20 +8841,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "קבצי שרת OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8022,5 +8863,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8213,35 +9054,46 @@ msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - -#: ../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:104 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "" + +#: ../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 "" @@ -8254,5 +9106,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." @@ -8261,23 +9113,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8288,30 +9140,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 "" -#: ../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 " @@ -8321,21 +9173,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 " @@ -8345,5 +9197,5 @@ "הקיימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8351,19 +9203,19 @@ 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." msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה." -#: ../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 " @@ -8371,13 +9223,13 @@ msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף." -#: ../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" @@ -8388,5 +9240,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" @@ -8395,18 +9247,18 @@ msgstr[1] "הורד מידע על התוסף מ{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 "" -#: ../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 "" @@ -8419,9 +9271,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 "" @@ -8434,35 +9286,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" @@ -8476,18 +9328,18 @@ "האחרונה של 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 "כלול את הצעדים לקבלת השגיאה (בפירוט רב ככל האפשר)!" -#: ../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 " @@ -8495,19 +9347,19 @@ msgstr "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה." -#: ../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 "(הטקסט כבר הועתק ל-clipboard שלך)." -#: ../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 "" -#: ../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 "" @@ -8516,5 +9368,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8523,5 +9375,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8534,5 +9386,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" @@ -8542,5 +9394,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8551,17 +9403,17 @@ "\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 "" @@ -8570,4 +9422,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8592,9 +9479,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 @@ -8602,27 +9507,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" +#: ../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}" @@ -8630,47 +9548,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 "" -#: ../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 "" -#: ../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 "" @@ -8783,19 +9701,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 "" -#: ../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." @@ -8804,34 +9722,34 @@ msgstr "" -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "" -#: ../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" @@ -8839,69 +9757,69 @@ msgstr "שגיאה בזמן ניתוח התאריך:" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8912,9 +9830,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 "" @@ -8925,65 +9843,65 @@ "פורמט מצופה: {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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8991,13 +9909,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9018,5 +9936,5 @@ msgstr "שגיאה בקובץ {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9029,12 +9947,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 "שגיאה בטעינת קובץ" @@ -9065,6 +9982,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9073,21 +9990,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" @@ -9096,37 +10013,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 "" -#: ../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." @@ -9138,18 +10066,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9157,5 +10085,5 @@ msgstr "" -#: ../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). " @@ -9163,39 +10091,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9251,12 +10179,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "יוצר קשר עם שרת ה-OSM..." +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 @@ -9290,20 +10216,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" @@ -9311,9 +10237,14 @@ 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 +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" @@ -9321,30 +10252,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "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 @@ -9406,6 +10346,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)" @@ -9427,6 +10367,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 "שכבה ריקה" @@ -9442,7 +10382,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 @@ -9962,6 +10902,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 "מים" @@ -9974,8 +10914,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 @@ -10261,9 +11197,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 "" -#: ../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 " @@ -10272,5 +11208,5 @@ msgstr "" -#: ../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 "" @@ -10832,5 +11768,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 "שם רחוב" @@ -10849,29 +11785,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 "מצטער, לא עובד עם משתמשים אנונימיים" @@ -10885,23 +11821,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 "" -#: ../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" @@ -10910,38 +11838,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10949,81 +11877,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "כתובת" -#: ../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 "" -#: ../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?" @@ -11033,25 +11961,25 @@ msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?" -#: ../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 "" @@ -11140,53 +12068,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" @@ -11211,20 +12139,52 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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: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 @@ -11307,23 +12267,23 @@ msgstr "מבחן זה מחפש דרכים עם שמות דומים שעלולים לנבוע משגיאות כתיב." -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -11334,7 +12294,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 "צירופי תווית \\ ערך לא חוקיים" @@ -11342,80 +12302,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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" -#: ../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:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11423,82 +12383,82 @@ msgstr "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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 "" -#: ../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}''" @@ -11643,7 +12603,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 "בניין" @@ -11657,5 +12617,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 "שטח" @@ -11791,5 +12751,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "אירעה שגיאה" @@ -11834,14 +12794,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}" @@ -11852,26 +12812,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 "" -#: ../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 "" -#: ../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 " @@ -11879,37 +12839,55 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -11922,104 +12900,143 @@ 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 "" -#: ../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 "" -#: ../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" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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}" msgstr "גירסת קובץ 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 "" -#: ../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 (ברירת מחדל)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "הזן שם תפריט וכתובת WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "העתק ברירת מחדל" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12382,62 +13399,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" @@ -12452,5 +13414,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 "מסלולים" @@ -12465,5 +13427,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" @@ -12473,10 +13434,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 "מהירות מירבית (קמ\"ש)" @@ -12520,9 +13481,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 "חד סטרי" @@ -12570,13 +13531,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 "גשר" @@ -12618,13 +13579,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 "מנהרה" @@ -12664,12 +13625,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 "" @@ -12709,12 +13670,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 "" @@ -12870,17 +13831,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 "" @@ -12907,4 +13868,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" @@ -12923,11 +13885,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 "שטח פנים" @@ -12937,4 +13900,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" @@ -12949,9 +13913,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 "סלול" @@ -12959,10 +13924,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" @@ -12970,12 +13998,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)" @@ -13056,20 +14166,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 "דרך ללא מוצא" @@ -13082,8 +14192,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 "גישה" @@ -13118,32 +14228,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 "כן" @@ -13156,40 +14281,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 "" @@ -13202,19 +14327,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 "יעד" @@ -13237,65 +14362,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13310,10 +14440,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 "סוס" @@ -13329,17 +14459,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" @@ -13351,30 +14480,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 "מהירות מינימלית (קמ\"ש)" @@ -13382,25 +14511,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 "כיכר" @@ -13411,5 +14540,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 "ערוך צומת" @@ -13425,5 +14554,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" #. @@ -13431,9 +14560,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 "סוג" @@ -13453,10 +14582,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 "" @@ -13478,10 +14607,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 "" @@ -13503,10 +14632,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 "" @@ -13528,5 +14657,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" @@ -13541,9 +14670,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 "" @@ -13557,9 +14686,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 "" @@ -13589,10 +14718,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 "" @@ -13622,6 +14751,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 "בנייה" @@ -13632,10 +14761,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 "" @@ -13643,19 +14772,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 "צומת" @@ -13671,5 +14800,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "כיכר" @@ -13678,5 +14807,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13684,5 +14813,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13690,5 +14819,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "שביל אופניים" @@ -13698,11 +14827,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 "שביל להולכי רגל" @@ -13711,11 +14846,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 "הולכי רגל" @@ -13724,5 +14865,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "ערוך רחוב להולכי רגל" @@ -13730,5 +14871,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "מדרגות" @@ -13738,5 +14879,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 "ערוך גרם מדרגות" @@ -13745,5 +14886,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13752,39 +14893,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 "" @@ -13793,5 +14906,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13799,5 +14912,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13806,5 +14919,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13812,5 +14925,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13819,5 +14932,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13825,5 +14938,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13832,5 +14945,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13838,5 +14951,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13845,5 +14958,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13852,5 +14965,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "נתיב" @@ -13859,19 +14972,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 "צעידה" @@ -13881,5 +14997,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 "ערוך צעידה" @@ -13887,5 +15003,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "צעידה הררית" @@ -13895,5 +15011,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 "ערוך צעידה הררית" @@ -13901,5 +15017,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "צעידה הררית מאומצת" @@ -13909,5 +15025,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 "ערוך צעידה הררית מאומצת" @@ -13915,5 +15031,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "צעידה אלפינית" @@ -13923,5 +15039,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 "ערוך צעידה אלפינית" @@ -13929,5 +15045,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "צעידה אלפינית מאומצת" @@ -13937,5 +15053,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 "ערוך צעידה אלפינית מאומצת" @@ -13943,5 +15059,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "צעידה אלפינית קשה" @@ -13951,5 +15067,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 "ערוך צעידה אלפינית קשה" @@ -13957,10 +15073,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 "" @@ -13968,15 +15084,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 "שירותים" @@ -13984,5 +15100,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "ערוך תחנת שירות" @@ -13996,4 +15112,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" #. @@ -14013,18 +15131,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 "מפעיל" @@ -14033,5 +15153,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "רמזור" @@ -14041,5 +15161,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "סוג מעבר חציה" @@ -14048,27 +15168,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 "" @@ -14076,6 +15196,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 "" @@ -14084,11 +15204,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 "" @@ -14096,30 +15216,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 "עצור" @@ -14127,5 +15247,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "מעבר חציה" @@ -14134,14 +15254,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14152,14 +15272,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 "" @@ -14169,20 +15289,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 "מצלמת מהירות" @@ -14190,5 +15310,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "טלפון חירום" @@ -14196,5 +15316,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14202,5 +15322,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14209,10 +15329,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 "ערוך אזור צליחה" @@ -14220,5 +15340,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "מעבר הרים" @@ -14226,5 +15346,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "ערוך מעבר הרים" @@ -14232,11 +15352,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 "הגבהה" @@ -14244,5 +15364,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "מחסומים" @@ -14250,5 +15370,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14256,5 +15376,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14299,16 +15419,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 "" @@ -14317,5 +15437,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "מחסום" @@ -14323,5 +15443,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14329,10 +15449,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 "" @@ -14340,15 +15460,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 "תא אגרה" @@ -14356,5 +15476,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "ערוך תא אגרה" @@ -14362,10 +15482,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 "ערוך ביקורת גבולות" @@ -14375,5 +15495,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14382,5 +15502,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14389,5 +15509,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "חומה" @@ -14395,5 +15515,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "חומת עיר" @@ -14402,5 +15522,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14412,15 +15532,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 "שער" @@ -14428,50 +15548,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 "" @@ -14479,25 +15599,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 "" @@ -14508,10 +15628,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 "מעיין" @@ -14519,5 +15639,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "ערוך מעיין" @@ -14525,5 +15645,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14531,10 +15651,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 "נחל" @@ -14542,10 +15662,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 "תעלה" @@ -14553,10 +15673,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 "נהר" @@ -14566,5 +15686,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 "ערוך נהר" @@ -14572,15 +15692,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 "ערוך אדמה" @@ -14588,15 +15708,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 "" @@ -14604,15 +15724,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 "" @@ -14620,5 +15740,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "גדת נחל" @@ -14627,10 +15747,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 "" @@ -14641,14 +15761,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 "אדמה בוצית" @@ -14662,35 +15782,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 "חוף" @@ -14698,20 +15818,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 "צוק" @@ -14719,10 +15839,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 "קו חוף" @@ -14730,5 +15850,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "ערוך קו חוף" @@ -14736,5 +15856,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "נתיב מעבורת" @@ -14742,5 +15862,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "ערוך מעבורת" @@ -14749,5 +15869,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "מספנה" @@ -14755,10 +15875,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 "" @@ -14766,5 +15886,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14772,5 +15892,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "" @@ -14778,15 +15898,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 "" @@ -14795,5 +15915,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14801,20 +15921,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 "" @@ -14823,15 +15943,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 "" @@ -14839,10 +15959,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 "" @@ -14850,10 +15970,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 "" @@ -14863,5 +15983,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 "" @@ -14869,10 +15989,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 "" @@ -14880,5 +16000,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -14908,8 +16028,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 "" @@ -14923,35 +16043,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 "" @@ -14959,45 +16079,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 "" @@ -15005,5 +16125,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15012,14 +16132,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 "" @@ -15028,5 +16148,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15035,5 +16155,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15043,5 +16163,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15049,5 +16169,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15056,10 +16176,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 "" @@ -15067,10 +16187,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 "" @@ -15078,10 +16198,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 "" @@ -15089,10 +16209,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 "" @@ -15100,5 +16220,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15106,5 +16226,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 "תחנה" @@ -15115,10 +16235,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 "דלק" @@ -15128,9 +16248,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" @@ -15150,47 +16499,74 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" +#. 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:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 +#: 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 +msgid "Capacity (overall)" +msgstr "" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 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 +#: build/trans_presets.java:1398 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "ערוך שטיפת רכב" @@ -15198,5 +16574,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "חנות" @@ -15204,15 +16580,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "ערוך חנות רכב" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "תיקונים" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "ערוך תיקוני רכבים" @@ -15220,5 +16596,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "השכרה" @@ -15227,10 +16603,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "ערוך השכרת רכב" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "שיתוף" @@ -15238,5 +16614,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "ערוך שיתוף רכבים" @@ -15244,6 +16620,11 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" +msgstr "" + +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" msgstr "" @@ -15251,5 +16632,5 @@ #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "ערוך השכרת אופניים" @@ -15258,15 +16639,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 "" @@ -15274,5 +16655,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15280,5 +16661,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15286,5 +16667,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -15293,5 +16674,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -15299,5 +16680,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -15306,5 +16687,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -15316,5 +16697,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 "" @@ -15322,10 +16703,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 "כניסת רכבת תחתית" @@ -15334,10 +16715,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 "" @@ -15346,5 +16727,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "תחנת אוטובוס" @@ -15353,5 +16734,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "ערוך תחנת אוטובוס" @@ -15359,5 +16740,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -15367,5 +16748,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 "" @@ -15374,8 +16755,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 "מקלט" @@ -15383,10 +16762,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 "" @@ -15394,5 +16773,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "מונית" @@ -15400,5 +16779,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "ערוך תחנת מוניות" @@ -15406,5 +16785,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "שדה תעופה" @@ -15412,15 +16791,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 "" @@ -15429,5 +16808,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "לינה" @@ -15439,5 +16818,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "מלון" @@ -15446,15 +16825,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 "" @@ -15462,20 +16841,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 "" @@ -15483,10 +16862,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 "" @@ -15494,30 +16873,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 "" @@ -15525,10 +16904,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 "מזון ושתיה" @@ -15539,5 +16918,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "מסעדה" @@ -15545,5 +16924,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "" @@ -15551,5 +16930,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 "" @@ -15557,61 +16936,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 "מזון מהיר" @@ -15619,9 +16998,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 "בית קפה" @@ -15629,10 +17008,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 "פאב" @@ -15640,20 +17018,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 "בר" @@ -15661,10 +17037,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 "מועדון לילה" @@ -15672,33 +17047,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 "מוזיאון" @@ -15706,10 +17072,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 "גן חיות" @@ -15718,10 +17083,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 "נקודת תצפית" @@ -15729,25 +17093,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 "יצירת אומנות" @@ -15755,5 +17118,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "ערוך יצירת אומנות" @@ -15761,86 +17124,209 @@ #. 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 +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 "עיר" + +#: 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)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. 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 "תיאור מסלול GPS" + +#: 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 "ערוך מקלט" @@ -15848,25 +17334,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 "טירה" @@ -15875,20 +17361,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 "אתר ארכיאולוגי" @@ -15897,10 +17382,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 "שדה קרב" @@ -15908,5 +17392,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "ערוך שדה קרב" @@ -15914,15 +17398,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 "מצבת זיכרון" @@ -15930,45 +17414,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 "מגרש משחקים" @@ -15976,15 +17460,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 "ערוך דייג" @@ -15992,15 +17476,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 "ערוך איצטדיון" @@ -16014,6 +17498,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 "בחר ענף ספורט:" @@ -16405,30 +17889,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 "ספורט" @@ -16438,227 +17922,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 "" @@ -16697,248 +18179,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "ירי" @@ -16946,178 +18420,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 "מבנה" @@ -17125,5 +18599,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "מבנה ציבור" @@ -17131,10 +18605,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 "בניין העירייה" @@ -17142,10 +18616,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 "שגרירות" @@ -17153,10 +18627,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 "בית משפט" @@ -17165,10 +18639,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 "כלא" @@ -17177,10 +18651,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 "משטרה" @@ -17190,10 +18664,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 "תחנת מכבי אש" @@ -17202,10 +18676,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 "דואר" @@ -17213,5 +18687,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "ערוך דואר" @@ -17219,15 +18693,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 "בית ספר" @@ -17235,10 +18709,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 "אוניברסיטה" @@ -17246,10 +18720,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 "מכללה" @@ -17257,5 +18731,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "ערוך מכללה" @@ -17263,5 +18737,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "קולנוע" @@ -17270,10 +18744,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 "ספרייה" @@ -17282,10 +18756,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 "מרכז אומנויות" @@ -17293,10 +18766,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 "תיאטרון" @@ -17305,10 +18778,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 "מקום תפילה" @@ -17318,5 +18791,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 "ערוך מקום תפילה" @@ -17325,6 +18798,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 "דת" @@ -17333,66 +18806,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 "" @@ -17401,81 +18874,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 "כתובות" @@ -17484,5 +18957,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "ערוך כתובת" @@ -17490,5 +18963,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "מספר בית" @@ -17496,20 +18969,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 "קוד מדינה" @@ -17517,5 +18990,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "" @@ -17524,5 +18997,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "" @@ -17530,71 +19003,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 "מגדלור" @@ -17602,10 +19071,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 "טחנת רוח" @@ -17613,10 +19082,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 "צינור" @@ -17624,10 +19093,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 "" @@ -17637,10 +19106,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 "" @@ -17648,10 +19117,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 "" @@ -17659,10 +19128,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 "" @@ -17670,10 +19139,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 "" @@ -17681,5 +19150,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "" @@ -17687,5 +19156,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "" @@ -17695,39 +19164,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 "תחנת כח" @@ -17736,10 +19205,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 "" @@ -17748,5 +19217,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "" @@ -17754,10 +19223,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 "עמוד חשמל" @@ -17768,5 +19237,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 "ערוך עמוד חשמל" @@ -17774,5 +19243,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "קו מתח" @@ -17781,46 +19250,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 "טלפון" @@ -17829,5 +19292,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "ערוך טלפון" @@ -17835,5 +19298,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 "" @@ -17841,5 +19304,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 "" @@ -17847,5 +19310,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 "" @@ -17853,5 +19316,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 "" @@ -17859,15 +19322,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 "" @@ -17876,5 +19339,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "ערוך תחנת מיחזור" @@ -17882,80 +19345,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 "מזרקה" @@ -17964,10 +19423,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 "מי שתיה" @@ -17976,10 +19435,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 "" @@ -17987,25 +19446,34 @@ #. 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 +msgid "Chemist" +msgstr "" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "ערוך עיר" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "מכולת" @@ -18013,10 +19481,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 "קיוסק" @@ -18024,10 +19491,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 "מכונת ממכר" @@ -18035,5 +19521,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "ערוך מכונת ממכר" @@ -18041,88 +19527,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 "קצבייה" @@ -18130,10 +19616,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 "מאפייה" @@ -18141,10 +19626,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 "פרחים" @@ -18152,20 +19636,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 "" @@ -18173,60 +19655,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 "" @@ -18234,10 +19710,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 "" @@ -18245,10 +19720,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 "חנות עשה-זאת-בעצמך" @@ -18256,60 +19730,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 "ניקוי יבש" @@ -18317,10 +19785,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 "מכבסה" @@ -18328,10 +19795,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 "" @@ -18339,35 +19805,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 "בנק" @@ -18375,16 +19838,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 "החלפת כסף" @@ -18392,5 +19853,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "ערוך החלפת כסף" @@ -18398,15 +19859,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 "רופאים" @@ -18414,20 +19875,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 "בית מרקחת" @@ -18435,5 +19894,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "ערוך בית מרקחת" @@ -18441,10 +19900,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 "בית חולים" @@ -18452,10 +19910,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 "נקודת גישה בחירום" @@ -18464,5 +19922,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "ערוך נקודת גישה בחירום" @@ -18471,20 +19929,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)" @@ -18492,5 +19950,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 "וטרינרי" @@ -18499,55 +19957,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 "ערוך מחוז" @@ -18555,15 +20013,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "עיר" #. 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 "עיירה" @@ -18571,10 +20029,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 "פרבר" @@ -18582,25 +20040,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 "ערוך כפר קטן" @@ -18608,5 +20066,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "מקומיות" @@ -18614,10 +20072,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 "אי" @@ -18625,11 +20083,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 "פתח מערה" @@ -18637,10 +20108,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 "פסגה" @@ -18648,10 +20119,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 "קרחון" @@ -18659,10 +20130,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 "הר געש" @@ -18670,70 +20141,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 "עץ" @@ -18742,15 +20213,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 "חורש" @@ -18759,5 +20230,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "ערוך חורש" @@ -18765,17 +20236,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 "יער" @@ -18784,14 +20255,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 "" @@ -18799,25 +20270,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 "" @@ -18825,10 +20296,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 "שדה-בור" @@ -18836,5 +20307,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "ערוך שדה-בור" @@ -18842,5 +20313,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "חצר משק" @@ -18849,45 +20320,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 "" @@ -18895,25 +20366,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 "" @@ -18921,10 +20392,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 "" @@ -18932,20 +20403,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 "" @@ -18953,5 +20424,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -18959,15 +20430,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 "בית-קברות" @@ -18975,9 +20446,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 "בית עלמין" @@ -18985,39 +20456,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 "" @@ -19025,15 +20496,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 "" @@ -19041,55 +20512,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 "" @@ -19099,5 +20570,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 "" @@ -19106,10 +20577,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 "" @@ -19117,5 +20588,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19124,5 +20595,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19130,34 +20601,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 "" @@ -19166,15 +20637,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 "" @@ -19182,5 +20653,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19189,5 +20660,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19195,5 +20666,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19265,5 +20736,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 @@ -19272,17 +20743,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 "" @@ -19335,5 +20806,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 @@ -19342,13 +20813,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 "" @@ -19362,10 +20833,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 "" @@ -19373,31 +20844,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 "" @@ -19406,30 +20877,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 "" @@ -19867,11 +21338,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 "מיושן" @@ -20197,41 +21668,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 @@ -21932,5 +23366,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 "" @@ -22529,55 +23963,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22591,5 +23976,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 "תיירות" @@ -22661,8 +24046,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 "היסטורי" @@ -22733,8 +24118,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 "ירוק" @@ -22748,5 +24133,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "מחצבה" @@ -22760,5 +24145,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22780,5 +24165,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22792,5 +24177,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "יער" @@ -22804,5 +24189,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22825,5 +24210,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "קמעוני" @@ -22837,5 +24222,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "תעשייתי" @@ -22849,5 +24234,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22861,5 +24246,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22873,5 +24258,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -22928,7 +24313,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 "צבאי" @@ -22942,5 +24327,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "בית עלמין" @@ -22953,5 +24338,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "פיסגה" @@ -22966,5 +24351,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "קרחון" @@ -22978,5 +24363,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "הר געש" @@ -23031,8 +24416,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 "טבעי" @@ -23046,5 +24431,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23058,18 +24443,6 @@ #. #. -#: 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 "" @@ -23082,5 +24455,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "בוץ" @@ -23094,5 +24467,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "חוף" @@ -23170,8 +24543,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 "" @@ -23219,7 +24592,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 "גבול" @@ -23361,10 +24734,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 "מקום" @@ -23412,6 +24794,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 "כתובת" @@ -23708,4 +25090,62 @@ msgstr "" +#~ 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 "" +#~ "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 "Cannot open preferences directory: {0}" +#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" + +#~ msgid "nodes" +#~ msgstr "נקודות" + +#~ msgid "ways" +#~ msgstr "דרכים" + +#~ msgid "relations" +#~ msgstr "יחסים" + +#~ msgid "Delete Layer" +#~ msgstr "מחק שכבה" + +#~ msgid "Authors: {0}" +#~ msgstr "מחברים: {0}" + +#~ msgid "Public" +#~ msgstr "ציבורי" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה." + +#~ msgid "Continue anyway" +#~ msgstr "המשך בכל זאת" + +#~ msgid "map" +#~ msgstr "מפה" + +#~ msgid "citymap" +#~ msgstr "מפת עיר" + +#~ msgid "hikingmap" +#~ msgstr "מפת צעידה" + +#~ msgid "bicyclemap" +#~ msgstr "מפת רכיבה" + #~ msgid "Move" #~ msgstr "הזז" @@ -23713,7 +25153,4 @@ #~ msgid "Data Layer" #~ msgstr "שכבת נתונים" - -#~ msgid "Not implemented yet." -#~ msgstr "עדיין לא הוטמע." #~ msgid "Unknown file extension." Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 17484) +++ /applications/editors/josm/i18n/po/is.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 13:47+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-05 14:32+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\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" -#: ../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 "Bý til aðal notandaviðmót" #. 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 "Hjálp" -#: ../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 "Ekki var hægt að virkja vörpunina „{0}“. Nota Meracator í staðin" -#: ../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 @@ -96,153 +99,159 @@ #: ../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 "Villa" -#: ../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] "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?" +msgstr[1] "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Óvistaðar breytingar" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?" - -#: ../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 "Vista og hætta" -#: ../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 "Hunsa og hætta" -#: ../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 "Hætta við" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../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 "Aðvörun" -#: ../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 "" + +#: ../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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Viðbætur" @@ -344,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -359,5 +376,5 @@ msgstr "" -#: ../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 "Veldu lag til að sameina þessu lagi." @@ -367,11 +384,11 @@ msgstr "Veldu lag til að sameina" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Sameina" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -380,5 +397,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 "" @@ -395,11 +412,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 @@ -428,5 +445,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 "Breiddargráða" @@ -435,30 +452,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 "Lengdargráða" +#: ../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 "Raða hnútum í hring" -#: ../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 "Raða völdum hnútum í hring." -#: ../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 @@ -472,6 +489,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 @@ -479,58 +496,57 @@ msgstr "Tól: {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 "Veldu minnst fjóra hnúta" #. 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 "Upplýsingar" #. 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 "Raða hnútum í línu" -#: ../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 "Raða völdum hnútum í beina línu." -#: ../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 "Vinsamlegast veldu a.m.k. þrjá hnúta" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -539,10 +555,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -551,5 +567,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -558,46 +574,46 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "gögnum" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "lagi" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "vali" -#: ../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 "árekstri" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "niðurhali" +#: ../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 "Þysja að {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 "Þysja að {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 @@ -607,22 +623,22 @@ msgstr "" -#: ../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 "Ekkert er valið til að þysja að." -#: ../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 "Sameina vegi" -#: ../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 "Sameina marga vegi í einn." -#: ../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 "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." @@ -633,4 +649,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Sameina þá" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -640,19 +660,7 @@ "það?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Sameina þá" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Skipta um átt?" - -#: ../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 "" -"Vegirnir sem eru valdir gátu ekki verið sameinaðir þannig að áttir þeirra " -"haldist sér. Vilt þú skipta um átt sumra þeirra?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -660,27 +668,34 @@ msgstr "Skipta um átt og sameina" -#: ../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 "" +"Vegirnir sem eru valdir gátu ekki verið sameinaðir þannig að áttir þeirra " +"haldist sér. Vilt þú skipta um átt sumra þeirra?" + +#: ../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 "Leysa árekstra" -#: ../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 "Sameina {0} vegi" -#: ../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 " @@ -690,32 +705,32 @@ "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" +#: ../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 "Afrita" -#: ../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 "Afrita valda hluti á klemmuborðið." -#: ../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 "Veldu eithvað til að afrita" +#: ../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 "Búa til hring" -#: ../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 "Búa til hring úr þrem völdum hnútum." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -725,20 +740,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 "Fjarlægja" @@ -748,85 +763,86 @@ msgstr "Eyða völdum hlutum." -#: ../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 "Yfirskrifa" -#: ../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 "Þessi skrá er þegar til. Yfirskrifa hana?" #. 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 "Dreifa hnútum jafnt" -#: ../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 "Dreifa völdum hnútum á jöfnu millibili á línu." +#: ../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 "Niðurhala frá 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 "Niðurhala kortagögnum frá OSM þjóninum." -#: ../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 "Skrá: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Niðurhala" -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -835,6 +851,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 "Tvöfalda" @@ -858,85 +874,90 @@ msgstr "Hætta í forritinu." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +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 "Vista sem 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 "Vista gögnin í GPX sniði." -#: ../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 "Ekkert til að vista. Opnaðu gögn fyrst." -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM vefhjálp" -#: ../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 "Opna í vafra" -#: ../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 "Breyta" -#: ../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 "Endurhlaða" -#: ../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 "" -#: ../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 "" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -988,22 +1009,26 @@ msgstr "Sameina það lag sem nú er valið öðru lagi" +#: ../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 "Sameina hnúta" -#: ../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 "Sameina valda hnúta á staðsetningu þess elsta." -#: ../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 "Veldu minnst tvo hnúta til að sameina." -#: ../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 "Sameina hnúta sem eru stak í mismunandi venslum?" -#: ../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 " @@ -1013,77 +1038,73 @@ "það?" -#: ../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 "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun." -#: ../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 "" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Spegla" -#: ../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 "Spegla valda hnúta og vegi." -#: ../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:36 +msgid "up" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -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: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 "" -#: ../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:55 +#, java-format +msgid "Move {0}" +msgstr "Færa {0}" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format -msgid "Move {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 -#, java-format msgid "Moves Objects {0}" msgstr "" -#: ../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 "" @@ -1091,5 +1112,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 "Ný" @@ -1099,17 +1120,22 @@ msgstr "Skapa nýtt kort." -#: ../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 "Opna..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Opna skrá." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Opna skrá." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Óþekkt hlutverk \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1147,21 +1173,17 @@ msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður" -#: ../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 "" -#: ../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 " @@ -1170,9 +1192,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 "Aðeins einn hnútur valinn" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Hornrétta" @@ -1188,13 +1210,26 @@ msgstr "Líma innihald klemmuborðsins." -#: ../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 "Líma eigindi" -#: ../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 "Líma eigindi hluta á klemmuborðinu á alla valda hluti." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1220,37 +1255,32 @@ msgstr "Endurtaka afturkallaða aðgerð." -#: ../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 "Endurnefna lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Endurnefna skránna líka" -#: ../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 "" +#: ../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 "Skipta um átt vega" -#: ../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 "Skipta um átt allra valdra vega." -#: ../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 "Skipta um átt vega" @@ -1258,10 +1288,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 "Vista" #: ../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 "Vista þau gögn sem sjást núna." @@ -1272,35 +1303,25 @@ msgstr "Skráin {0} er þegar til. Yfirskrifa hana?" -#: ../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 "Tómt skjal" -#: ../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 "Árekstrar" -#: ../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 " @@ -1308,28 +1329,28 @@ msgstr "" -#: ../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 "Vista OSM skrá" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Vista GPX skrá" -#: ../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 "Vista sem..." -#: ../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 "Vista þau gögn sem sjást núna í nýja skrá." @@ -1362,33 +1383,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Stöðuskýrsla" -#: ../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 "Afrita á klemmuborðið og loka" -#: ../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 "Loka" +#: ../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 "Skipta veg" -#: ../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 "Skipta veg á völdum hnút(um)." -#: ../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." @@ -1396,5 +1417,5 @@ msgstr[1] "" -#: ../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 " @@ -1406,9 +1427,9 @@ msgstr[1] "" -#: ../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." @@ -1416,10 +1437,10 @@ msgstr[1] "" -#: ../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 " @@ -1427,5 +1448,5 @@ msgstr "" -#: ../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 " @@ -1433,5 +1454,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 " @@ -1439,8 +1460,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 "Skipta veginum {0} í {1} hluta" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Loka breytingasetti..." + +#: ../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 "Loka breytingasetti..." + +#: ../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 "Opna breytingasett..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Loka breytingasetti..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1458,56 +1504,56 @@ msgstr "" +#: ../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 "Aðskilja vegi" -#: ../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 "Skipta upp hnút sem er notaður af mörgum vegum." -#: ../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:120 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One tagged node, or" +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, or" +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" +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: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 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../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" @@ -1517,9 +1563,9 @@ msgstr "" -#: ../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" @@ -1527,5 +1573,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" @@ -1570,61 +1616,71 @@ "Nær aftur í gögnin sem sjást í núverandi lagi frá þjóninum og uppfærir þau." -#: ../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 "Uppfæri gögn" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Uppfæra val" -#: ../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 "Uppfærir þá hluti sem eru valdir frá þjóninum" +#: ../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:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "Upphala til 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 "Upphala öllum breytingum á OSM þjóninn." -#: ../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 "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst." + +#: ../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 "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Engar breytingar til að hlaða upp." -#: ../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 "" -#: ../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 "" @@ -1638,17 +1694,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1659,64 +1715,152 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Hlaða upp breytingum?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Hlaða upp breytingum" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Breyti nýjum venslum í laginu „{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 "Bætti hnút við veg sem til var fyrir" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "senda allar breytingarnar í einu á þjónin" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " "changed primitive" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +"Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef " +"ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Kortastillingar" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Hlutum sem verður bætt við:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Hlutum sem verður breytt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Hlutum sem verður eytt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Bættu við stuttri umsögn um þær breytingar sem þú ert að hlaða upp:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Hlaða upp breytingum?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Hlaða upp breytingum" - -#: ../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] "Hlutum sem verður bætt við:" +msgstr[1] "Hlutum sem verður bætt við:" + +#: ../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] "Hlutum sem verður breytt:" +msgstr[1] "Hlutum sem verður breytt:" + +#: ../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] "Hlutum sem verður eytt:" +msgstr[1] "Hlutum sem verður eytt:" + +#: ../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 "Síðast breytt {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1740,20 +1884,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 "" -#: ../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 "" @@ -1795,10 +1939,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 "" @@ -1826,31 +1970,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 "Ekki var náð í nein gögn" -#: ../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 gögn" -#: ../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 "Niðurhal {0} af {1} ({2} eftir)" -#: ../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 "" @@ -1862,20 +2002,20 @@ msgstr "" -#: ../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 "Eyða hnútum eða vegum" -#: ../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 @@ -1884,5 +2024,5 @@ msgstr "" -#: ../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 " @@ -1890,55 +2030,69 @@ msgstr "" -#: ../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 "" +#: ../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 "Teikna hnúta og vegi" -#: ../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 @@ -1946,38 +2100,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 "Get ekki bætt við hnút handan endamarka veraldar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Bæta við hnút" -#: ../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 "Bæta hnút við veg" -#: ../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 +msgstr "Bætti hnút við veg sem til var fyrir" + +#: ../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." @@ -1986,14 +2140,14 @@ msgstr[1] "" -#: ../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 "" @@ -2013,5 +2167,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 "" @@ -2022,5 +2176,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 "" @@ -2036,17 +2190,18 @@ msgstr "" +#: ../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 "Val" -#: ../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 "Velja, færa og snúa hlutum" -#: ../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" @@ -2055,30 +2210,37 @@ msgstr[1] "" -#: ../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 "Færa þá" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Ekki færa þá" + +#: ../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 "" - -#: ../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 +"Þú færðir meira en {0} hluti. Óreyndir notendur færa oft marga hluti fyrir " +"slysni.\n" +"Ert þú viss um að þú viljir færa þessa hluti?" + +#: ../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." msgstr "" -#: ../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-" @@ -2101,44 +2263,44 @@ msgstr "" +#: ../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 "Leita..." -#: ../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 "Leita að hlutum." -#: ../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 "Sláðu inn leitarstreng" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "skipta út vali" -#: ../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 "bæta við val" -#: ../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 "fjarlæga úr vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regluleg segð" -#: ../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 "" @@ -2146,18 +2308,18 @@ "gildi." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Gamla Hringbraut\" - „Gamla Hringbraut“ í einhverjum lykli og gildi." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Gamla Hringbraut\" - „Gamla Hringbraut“ í einhverjum lykli og gildi." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Gam - „Gam“ kemur fyrir í nafninu." -#: ../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 - lykilinn „type“ með gildið „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, " @@ -2167,17 +2329,17 @@ "*=gildi, type=, *=* og *=" -#: ../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:Gam - „Gam“ kemur ekki fyrir í nafninu." -#: ../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: - Lykillinn „foot“ með eitthvað gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Sérleitir:" -#: ../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)" @@ -2186,47 +2348,48 @@ "fyrir hnút, veg og vensl" -#: ../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:... - Hlutir sem breytt hefur verið af gefnum notanda" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - Hlutur með gefið kenni (e. „id“)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - Hlutur með gefið kenni (e. „id“)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)" -#: ../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 - Hlutum sem breytt hefur verið" -#: ../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 - Valdir hlutir" -#: ../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 - Ókláraðir hlutir" -#: ../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 "untagged - Hlutir án eiginda" -#: ../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" msgstr "child segð - allir undirhlutir sem passa við segðina" -#: ../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" msgstr "parent segð - allir yfirhlutir sem passa við segðina" -#: ../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 "Notaðu | eða OR t.d. „A | B“ til að leita að A eða B" -#: ../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 "" @@ -2234,46 +2397,46 @@ "„:“ eða „ “" -#: ../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 "Notaðu ( og ) til að sameina segðir" -#: ../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 "Leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Hefja leit" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "stafsetursónæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2334,58 +2497,96 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Sæki..." -#: ../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 "Gat ekki lesið frá veffang: \"{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 "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Bæta við hnút" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Vensl: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Breyta {0} hlut" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Síðast breytt {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Breyta venslum" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, java-format +msgid "Remove \"{0}\" for node ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, java-format +msgid "Remove \"{0}\" for way ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../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 +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, java-format +msgid "Set {0}={1} for node ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 +#, java-format +msgid "Set {0}={1} for way ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "" + +#: ../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" @@ -2394,10 +2595,10 @@ msgstr[1] "" -#: ../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 "" -#: ../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}" @@ -2409,5 +2610,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2416,10 +2617,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2428,5 +2629,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}''" @@ -2450,42 +2651,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../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] "Breyta {0} hlut" +msgstr[1] "Breyta {0} hlutum" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Færði {0} hnút" +msgstr[1] "Færði {0} hnúta" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Eyða laginu" +msgstr[1] "Eyða laginu" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Fjarlægja úr venslum" +msgstr[1] "Fjarlægja úr venslum" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Vensl rekast á" -#: ../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 "Fjarlægja úr venslum" + +#: ../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 "" "Valið \"{0}\" er notað af venslunum \"{1} með hlutverkið {2}.\n" "Eyða úr venslunum?" -#: ../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 "Fjarlægja úr venslum" - -#: ../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 "Valið „{0}“ er notað af venslunum „{1}“." -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "" @@ -2493,6 +2710,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." @@ -2504,5 +2721,5 @@ "verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2513,10 +2730,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" msgid_plural "Move {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Færði {0} hnút" +msgstr[1] "Færði {0} hnúta" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 @@ -2546,10 +2763,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2562,18 +2789,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Leysa {0} árekstra í {1} hlutum" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Leysa {0} árekstra í {1} hlutum" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Leysa {0} árekstra í {1} hlutum" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Leysa {0} árekstra í {1} hlutum" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Leysa {0} árekstra í {1} hlutum" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Leysa {0} árekstra í {1} hlutum" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2597,13 +2844,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Vensl" -#: ../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 "" @@ -2622,62 +2869,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 "Ekki vista breytingar" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../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 +#, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" + +#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -2691,29 +2995,36 @@ msgstr "" -#: ../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 "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "A" -#: ../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}" @@ -2725,15 +3036,229 @@ msgstr "" -#: ../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 "óklárað" - -#: ../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 "Villa: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Viðvörun: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "Óþekkt hlutverk \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "" + +#: ../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" @@ -2742,22 +3267,7 @@ msgstr[1] "hnútar" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Villa: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Viðvörun: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "hnútar" - -#: ../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" @@ -2766,12 +3276,7 @@ msgstr[1] "vegir" -#: ../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" @@ -2780,246 +3285,4 @@ msgstr[1] "vensl" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} stak" -msgstr[1] "{0} stök" - -#: ../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 "vatnsfarvegur" - -#: ../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} hnútur" -msgstr[1] "{0} hnútar" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "Óþekkt hlutverk \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "" - -#: ../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" @@ -3032,5 +3295,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "bakgrunnur" @@ -3040,5 +3303,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3048,5 +3311,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3057,21 +3320,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3092,8 +3355,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3101,15 +3364,101 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Ekki sýna þessi skilaboð aftur" -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "óklárað" + +#: ../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 "vatnsfarvegur" + +#: ../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} hnútur" +msgstr[1] "{0} hnútar" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} stak" +msgstr[1] "{0} stök" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "óskilgreint" + +#: ../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 "" @@ -3119,36 +3468,9 @@ msgstr "" -#: ../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 "óskilgreint" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3158,9 +3480,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 "" @@ -3169,9 +3491,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3180,9 +3502,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 "" @@ -3192,9 +3525,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 "" @@ -3204,11 +3537,6 @@ msgstr "" -#: ../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 "" @@ -3226,38 +3554,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 "Hlaða upp stillingum" -#: ../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 "Hlaða JOSM stillingum þínum upp á OSM þjóninn" -#: ../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 "strengur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Notandanafn." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM lykilorð." -#: ../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 "" -#: ../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 " @@ -3265,5 +3593,5 @@ msgstr "" -#: ../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 " @@ -3271,5 +3599,5 @@ msgstr "" -#: ../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 " @@ -3277,75 +3605,94 @@ msgstr "" -#: ../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 "Notandanafn" -#: ../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 "Lykilorð" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -3353,47 +3700,47 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Virki uppfærðar viðbætur" -#: ../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 "Hleð inn viðbótum" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Skrá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Sýn" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Tól" -#: ../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 "Forstillingar" -#: ../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 @@ -3405,21 +3752,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 "Möskvahamur" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Fara í möskvaham" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Fylla skjá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Fara í fullskjáham" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Hljóð" @@ -3459,58 +3806,44 @@ msgstr "Þysja út" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "skali" -#: ../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 "Lengdargráðan undir músabendlinum." +#: ../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:96 -msgid "The name of the object at the mouse pointer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Breiddargráðan undir músabendlinum." +#: ../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:98 +msgid "The (compass) heading of the line segment being drawn." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(enginn hlutur)" -#: ../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 "" - -#: ../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 "" @@ -3522,10 +3855,4 @@ msgid "File not found" msgstr "Skrá fannst ekki" - -#: ../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 @@ -3584,7 +3911,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" @@ -3600,5 +3926,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" @@ -3701,5 +4027,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 "" @@ -3710,5 +4036,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" @@ -3722,5 +4048,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 "" @@ -3795,6 +4121,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" @@ -3904,10 +4230,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 "" @@ -3916,19 +4242,19 @@ msgstr "" -#: ../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 "" @@ -3937,5 +4263,5 @@ msgstr "" -#: ../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 "" @@ -3953,9 +4279,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 " @@ -3963,110 +4289,112 @@ 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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4075,21 +4403,21 @@ msgstr "" -#: ../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 "Hlutverk" #: ../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 "" @@ -4128,10 +4456,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 @@ -4140,10 +4469,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 @@ -4157,5 +4487,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}" @@ -4196,4 +4526,139 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "Veldu lit" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 +#, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Óútfært." + +#: ../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 "af vegi" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Fjarlægja úr venslum" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +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} vegur" +msgstr[1] "{0} vegir" + +#: ../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} vensl" +msgstr[1] "{0} vensl" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Breyta upplausn" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Leysa árekstra" + +#: ../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 "Vista" + +#: ../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 "Líma" + +#: ../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} vegur" +msgstr[1] "{0} vegir" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4209,10 +4674,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 @@ -4220,5 +4685,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}" @@ -4249,36 +4714,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 "" @@ -4290,150 +4749,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 "Breytingaskrá" -#: ../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 "Sýna breytingarsögu valdra hluta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "Hnútur {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 "Lag: {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 "Vensl: {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 "Næ í breytingaskrá fyrir {0} með kennið {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 "Endurhlaða breytingaskrálistann með núverandi vali." #. 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 "Sýna" -#: ../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 "Sýna breytingasögu valdra hluta" -#: ../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 "Lög" -#: ../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 "Sýna lista yfir öll lög." -#: ../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 "Eyða völdu lagi." -#: ../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 "Eyða laginu" - -#: ../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 "Ert þú viss um að þú viljir eyða laginu „{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 "Já" - -#: ../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 "Eyða öllum lögunum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "Eyði lagi {0} af {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Sýna/Fela" -#: ../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 "Sýna eða fela valið lag." -#: ../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 "Virkja valið lag" -#: ../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 "Sameina þetta lag öðru lagi" -#: ../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 "Færa valið lag upp í röðinni" -#: ../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 "Færa valið lag niður í röðinni" -#: ../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 "Upplýsingar um lag" -#: ../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." @@ -4442,28 +4869,22 @@ msgstr[1] "Allt að {0} hlutum verður breytt." -#: ../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 "Tómt gildi eyðir lyklinum" -#: ../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 "Breyta eigindum" -#: ../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" @@ -4472,89 +4893,84 @@ msgstr[1] "Breyta eigindum allt að {0} hluta" -#: ../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 "Veldu lykil" -#: ../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 "Veldu gildi" -#: ../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 "Veldu hluti til að breyta eigindum þeirra." -#: ../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 "Eigindi" -#: ../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 "Eigindi valdra hluta." #. 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 "Stak í" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Bæti vað eigindum" -#: ../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 "Bæta við" -#: ../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 "Bæta nýjum eigindum við valda hluti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Breyta eigindum" -#: ../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 "Breyta gildi valins lykils í öllum völdum hlutum" -#: ../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 "" -#: ../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 "Breyta venslum" -#: ../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 "Eyða valinu úr venslunum {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 "Eyða völdum lykil í öllum völdum hlutumaccess" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +msgstr "Eyða völdum lykil í öllum völdum hlutum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Eyða eigindum" @@ -4563,36 +4979,36 @@ #. #. -#: ../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 "Vensl" -#: ../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 "Sýna lista yfir vensl" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265 +msgstr "Vensl: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 msgid "Open an editor for the selected relation" msgstr "Opna ritil til að breyta völdum venslum" -#: ../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 "Eyða völdum venslum" -#: ../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 "Skapa ný vensl" -#: ../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 "" +msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -4620,26 +5036,12 @@ #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Val: Vensl:{0} / Vegir:{1} / Nódur:{2}" +msgstr "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}" #: ../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 "Val" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} vegur" -msgstr[1] "{0} vegir" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} vensl" -msgstr[1] "{0} vensl" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4647,14 +5049,9 @@ msgstr "Val: {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 "Opna þessa stiku sem glugga" -#: ../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." @@ -4663,64 +5060,97 @@ "vinstri tólastikunni." -#: ../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 "Smelltu til að minnka/hámarka innihald stikunnar" -#: ../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 "Höfundar" -#: ../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 "Listi yfir notendur sem breyttu síðast völdum hlutum." -#: ../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] "Notandi" +msgstr[1] "Notandi" + +#: ../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 "Sýna" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Frekari upplýsingar um þessa forstillingu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Notandi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "Fjöldi hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "" - -#: ../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 "" @@ -4729,47 +5159,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 "Stök og tögg þeirra" -#: ../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 "Hlutverk:" -#: ../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 " @@ -4778,14 +5202,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 "" @@ -4795,9 +5219,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 "" @@ -4807,15 +5231,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4823,5 +5247,5 @@ msgstr "" -#: ../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 " @@ -4829,20 +5253,20 @@ msgstr "" -#: ../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 "" @@ -4851,57 +5275,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 "Færa valda meðlimi upp" #. 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 "Færa valda meðlimi niður" #. 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 " @@ -4910,9 +5334,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 "" @@ -4921,20 +5345,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 "Vista" - -#: ../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 @@ -4944,37 +5364,37 @@ msgstr "Í lagi" -#: ../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 "Bæta við tómu taggi" -#: ../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 "Eyða völdum töggum" -#: ../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 "Hala niður öllum nóðum og vegum í þessum venslum" -#: ../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 "Niðurhala meðlimum" -#: ../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 "Vistar hlutverk fyrir völd stök" -#: ../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 "Vista hlutverk" -#: ../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 "" @@ -4984,30 +5404,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 "" @@ -5021,22 +5441,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 "Hleð inn viðbótum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5069,34 +5494,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bókamerki" -#: ../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 "Sláðu inn hnitin fyrst" -#: ../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 "Sláðu inn nafn fyrir staðsetningu." -#: ../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 "Veldu fyrst bókmerki" @@ -5152,13 +5564,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 "Sláðu inn leitarstreng" -#: ../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 "Get ekki lesið niðurstöðu staðarleitar frá þjóni" @@ -5166,18 +5578,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 "Sláðu inn nafn á stað til að leita að" -#. 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 "Staðir" #. 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 "nafn" @@ -5216,37 +5627,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 "gerð" -#: ../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 "nálægt" -#: ../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 "þysja" -#: ../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: " @@ -5255,5 +5666,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 "Gagnvirkt kort" @@ -5280,47 +5691,75 @@ msgstr "Reitnúmer" -#: ../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 "Breytingaskrá: {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 "Breytingaskrá: {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Breytingaskrá: {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Loka þessum glugga" -#: ../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 "Sýna breytingasögu valdra hluta" + +#: ../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 "Hnútur {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 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" #. item "Streets/Motorway" text "Reference" @@ -5638,14 +6077,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5821,8 +6274,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" #. @@ -5919,4 +6378,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6030,6 +6492,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 @@ -6037,156 +6499,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 "Heiti" -#: ../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 "" "Útgáfa {0} búin til {1} af " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Breyta venslum" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Frekari upplýsingar um þessa forstillingu" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Síðast breytt {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6194,32 +6674,284 @@ msgstr "Útgáfa {0} búin til {1} af {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Útgáfa" -#: ../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 "Nafn götu" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Já" + +#: ../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 "Veldu gildi" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Hunsa og hætta" + +#: ../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 "Vista og hætta" + +#: ../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 "Lag" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +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 "Skrá" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Endurhlaða" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 @@ -6227,29 +6959,29 @@ msgstr "Les {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:587 +#, java-format +msgid "GPS start: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format -msgid "GPS start: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 -#, java-format msgid "GPS end: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#, java-format +msgid "current delta: {0}s" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 -#, java-format -msgid "current delta: {0}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 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" @@ -6258,14 +6990,14 @@ msgstr[1] "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Samstilla klukkur" -#: ../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 @@ -6273,82 +7005,82 @@ msgstr "JPEG myndir (*.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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Sérsníða teikningu lína" +#: ../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." +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 "Sérsníða liti" -#: ../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" @@ -6408,5 +7140,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}" @@ -6422,10 +7154,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 "Breyta í gagnalag" #: ../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." @@ -6434,11 +7166,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 "" #: ../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 @@ -6478,4 +7210,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Sæki gögn" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6494,64 +7231,64 @@ msgstr "" -#: ../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 "Gagnalag {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 "útgáfa {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 "" -#: ../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 "Tölfræði um {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 "" -#: ../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 útgáfa: {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 "Breyta í GPX-lag" -#: ../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" @@ -6559,5 +7296,5 @@ msgstr[1] "" -#: ../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" @@ -6565,5 +7302,5 @@ msgstr[1] "" -#: ../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" @@ -6572,5 +7309,5 @@ msgstr[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} consists of {1} track" @@ -6579,5 +7316,5 @@ msgstr[1] "{0} samanstendur af {1} ferlum" -#: ../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" @@ -6586,9 +7323,9 @@ msgstr[1] "" -#: ../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 punktur" -#: ../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" @@ -6596,5 +7333,5 @@ msgstr[1] "punktar" -#: ../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" @@ -6613,5 +7350,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}." @@ -6619,5 +7356,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 "" @@ -6645,5 +7382,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 " @@ -6651,5 +7388,5 @@ msgstr "" -#: ../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 " @@ -6657,29 +7394,29 @@ msgstr "" -#: ../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:43 +msgid "There was an error while trying to display the URL for this marker" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "There was an error while trying to display the URL for this marker" +msgid "(URL was: " msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 -msgid "(URL was: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Stillingarritill" -#: ../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 "Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða." -#: ../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 @@ -6687,26 +7424,26 @@ msgstr "Leita: " -#: ../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 "" -#: ../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 "Veldu hlut til að breyta fyrst." -#: ../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 @@ -6714,14 +7451,14 @@ msgstr "Nýtt gildi fyrir {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 "Veldu hlut til að eyða fyrst." -#: ../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 "Bættu við nýjum eigindum" @@ -6844,40 +7581,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 "Litur" -#: ../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 "" -#: ../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 "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Velja lit" -#: ../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 "Veldu lit fyrir „{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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Litir" @@ -6921,5 +7658,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Bíll" @@ -6941,16 +7678,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 "Hjól" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -6980,12 +7718,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 "Fótgangandi" @@ -7160,5 +7898,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 "" @@ -7166,23 +7904,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 "Sýna kenni hluta í vallistum" #: ../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 "Sýna kenni hluta í vallistum" + +#: ../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 "" -#: ../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 "Sýna kenni hluta í vallistum" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Útlit og viðmót" @@ -7214,54 +7963,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 "Stillingar fyrir viðbætur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Hala niður uppfærðum lista" -#: ../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 "Uppfæra" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Stilla viðbótarþjóna..." -#: ../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 "Bæta við viðbótarþjóni." -#: ../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 "Vinsamlegast veldu viðbótarþjón til að fjarlægja." -#: ../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 "Breyta viðbótarþjóni." -#: ../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 "Stilla viðbótarþjóna" #. 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 "Birtingarstillingar" -#: ../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 " @@ -7269,42 +8018,42 @@ msgstr "Stillingar sem hafa áhrif á útlit forritsins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Tengistillingar" -#: ../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 "Stillingar sem þarf til að tengjast OSM þjóninum." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Kortastillingar" -#: ../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 "Stillingar tengdar kortavörpun og gagnatúlkun." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Hljóðstillingar" -#: ../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 "" "Athugið að stundum þarf að endurræsa JOSM til að stillingar taki gildi." -#: ../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 "Sýna hnit sem" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Vörpun" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Kortavörpun" @@ -7337,12 +8086,4 @@ msgid "Proxy server password" msgstr "Lykilorð á milliþjóni" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Slóð OSM þjóns" #. 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 @@ -7369,61 +8110,60 @@ msgstr "Flýtileið" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "Veldu hlut til að afrita fyrst." -#: ../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 "" -#: ../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 "" @@ -7589,36 +8329,59 @@ 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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Bæta við nýju lagi" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Eyða völdu lagi." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Frekari upplýsingar um þessa forstillingu" #. 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 "Valfrjáls eigind:" -#: ../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 "Nota forstillinguna „{0}“ í flokknum „{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 "Nota forstillinguna „{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 "" -#: ../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 @@ -7626,15 +8389,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 @@ -7644,22 +8407,22 @@ msgstr[1] "Breyta {0} hlutum" -#: ../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 "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Breyta eigindum" -#: ../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}''" @@ -7698,11 +8461,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 "" -#: ../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 " @@ -7710,38 +8473,38 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "lýsing á gps ferli" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Bæta við höfundaupplýsingum" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nafn" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "" -#: ../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 "" @@ -7751,9 +8514,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 "" @@ -7762,10 +8525,10 @@ msgstr "" -#: ../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 @@ -7775,12 +8538,12 @@ msgstr "Punktar frá {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 "" -#: ../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" @@ -7801,6 +8564,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 @@ -7810,20 +8573,40 @@ msgstr "Hala niður OSM gögnum..." -#: ../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 "Breyti venslum #{0} í laginu „{1}“" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 +#, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7831,34 +8614,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "" -#: ../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:43 +msgid "Malformed sentences: " +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 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 "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "" @@ -7869,9 +8652,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7880,15 +8663,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7896,33 +8679,91 @@ msgstr "" -#: ../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 "Opna breytingasett..." -#: ../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 "Opna breytingasett..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Opna breytingasett..." + +#: ../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 "Opna breytingasett..." + +#: ../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 "Loka breytingasetti..." -#: ../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 "Loka breytingasetti..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Opna breytingasett..." + +#: ../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 "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Hleð upp gögnum..." -#: ../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}." @@ -7950,29 +8791,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Rangt lykilorð eða notandanafn" -#: ../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 "Viðvörun: Lykilorðið er sent ódulkóðað" -#: ../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 "Vista notandanafn og lykilorð (ódulkóðað)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Sláðu inn lykilorð" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Innskrá" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Notandanafn (eða netfang) á OSM þjóninum." -#: ../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." @@ -7980,13 +8825,17 @@ "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Slóð OSM þjóns" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM notandanafn (netfang)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM lykilorð" -#: ../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." @@ -7995,20 +8844,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8017,5 +8866,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8209,35 +9058,46 @@ "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína." -#: ../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} búið. Hleð upp: {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} búið. Hleð upp: {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} búið. Hleð upp: {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 "senda allar breytingarnar í einu á þjónin" + +#: ../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 "Uppfæra viðbætur" -#: ../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 "Hala niður viðbótum" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8250,5 +9110,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." @@ -8261,23 +9121,23 @@ "viðbæturnar." -#: ../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 "Niðurhel {0}..." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8288,30 +9148,30 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Viðbótin „{0}“ fannst ekki." -#: ../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 "Síðasta uppfærsa viðbóta var framkvæmd fyrir meira en {0} dögum." -#: ../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 " @@ -8319,21 +9179,21 @@ msgstr "" -#: ../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 "Gera viðbótina óvirka" -#: ../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 "Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?" -#: ../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 " @@ -8343,5 +9203,5 @@ "yfirskrifa núverandi viðbætur." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8349,19 +9209,19 @@ msgstr "" -#: ../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 "" -#: ../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." msgstr "" -#: ../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 " @@ -8369,13 +9229,13 @@ msgstr "" -#: ../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" @@ -8386,5 +9246,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" @@ -8393,18 +9253,18 @@ msgstr[1] "Halaði niður lista yfir viðbætur frá {0} þjónum" -#: ../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 "" -#: ../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 "Allar innsettar viðbætur eru af nýjustu útgáfu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8417,9 +9277,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 "Hala niður nýjum viðbótum" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8432,35 +9292,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}: Útgáfa {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 "" -#: ../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 "" -#: ../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 "Þetta er eftir enda upptöku" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Villa við að spila hljóð" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Gera ekkert" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Senda villutilkynningu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8474,14 +9334,14 @@ "útgáfuna af JOSM, vinsamlegast sendu þá inn villumeldinguna." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Óvænt villa" -#: ../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 "Vinsamlegast sendu meldinguna á {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 "" @@ -8489,5 +9349,5 @@ "nákvæmt og hægt er)" -#: ../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 " @@ -8497,19 +9357,19 @@ "tilkynnir um villu." -#: ../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 "Vertu viss um að láta eftirfarandi upplýsingar fylgja:" -#: ../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 "Textinn hefur verið þegar verið afritaður" -#: ../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 "" -#: ../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 "" @@ -8518,5 +9378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8525,5 +9385,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8536,5 +9396,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" @@ -8544,5 +9404,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8553,17 +9413,17 @@ "\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 "(Ráð: Þú getur breytt flýtileiðum í valkostum)" -#: ../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 "" @@ -8572,4 +9432,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8594,9 +9489,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 "Upphala feril" -#: ../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 @@ -8604,29 +9517,39 @@ msgstr "Upphala ferlum" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Sýnilegur öllum" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "" -"Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á 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 +msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" +msgstr "" + +#: ../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 "Lýsing" -#: ../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}" @@ -8634,47 +9557,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 "" -#: ../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 "Upphal gagna tókst ekki. Þjónnin skilaði eftirfarandi villuböðum: " -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -8783,19 +9706,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 skrár (*.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 "" -#: ../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 "" -#: ../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." @@ -8804,34 +9727,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -8839,69 +9762,69 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8910,9 +9833,9 @@ msgstr "" -#: ../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 "" @@ -8921,65 +9844,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8987,13 +9910,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9014,5 +9937,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9025,12 +9948,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 "Velja allt" - -#: ../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 "" @@ -9061,6 +9983,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9069,21 +9991,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" @@ -9092,37 +10014,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 "" -#: ../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." @@ -9134,18 +10067,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9153,5 +10086,5 @@ msgstr "" -#: ../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). " @@ -9159,39 +10092,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9247,7 +10180,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Hef samband við þjóninn..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 @@ -9285,20 +10217,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" @@ -9306,9 +10238,14 @@ 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 +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" @@ -9316,29 +10253,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "Líma" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "Athugasemd" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -msgid "Set Lambert coordinate" -msgstr "" +msgid "Set " +msgstr "Val" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9372,5 +10319,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 msgid "Add a new layer" -msgstr "" +msgstr "Bæta við nýju lagi" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 @@ -9400,6 +10347,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)" @@ -9421,6 +10368,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 "Tómt lag" @@ -9436,7 +10383,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Lög: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -9956,6 +10903,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 "vatn" @@ -9968,8 +10915,4 @@ msgid "land" msgstr "land" - -#: ../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 @@ -10252,9 +11195,9 @@ msgstr "" -#: ../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 "Sýna OpenStreetBugs pöddur" -#: ../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 " @@ -10263,5 +11206,5 @@ msgstr "" -#: ../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 "" @@ -10820,5 +11763,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 "Nafn götu" @@ -10837,29 +11780,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 "" @@ -10873,23 +11816,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 "" -#: ../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" @@ -10898,38 +11833,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10937,81 +11872,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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?" @@ -11021,25 +11956,25 @@ msgstr[1] "" -#: ../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 "Villur sem fundust við athugun" -#: ../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 "Engar villur fundust við athugun" -#: ../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 "" @@ -11126,53 +12061,53 @@ msgstr "Athuga gögnin" -#: ../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 "Gögnin stóðust ekki athugun. Upphala þrátt fyrir það?" -#: ../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 "Opna athugunarglugga." -#: ../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 "Þysja að vandamálinu" -#: ../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 "Laga" -#: ../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 "Laga valdar villur." -#: ../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 "Hunsa" -#: ../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 "Hunsa viðkomandi villu við næstu staðreyningu" -#: ../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" @@ -11197,20 +12132,50 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +#, fuzzy +msgid "Crossing buildings" +msgstr "bygging" + +#: ../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 +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 "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 "Hnútur endurtekinn í vegi" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11293,23 +12258,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11318,7 +12283,7 @@ msgstr "" +#: ../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 "" @@ -11326,80 +12291,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11407,82 +12372,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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:711 +msgid "Check property values." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "" -#: ../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}''" @@ -11627,7 +12592,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 "bygging" @@ -11641,5 +12606,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 "" @@ -11775,5 +12740,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11818,14 +12783,14 @@ msgstr "" -#: ../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}" @@ -11836,26 +12801,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 "" -#: ../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 "" -#: ../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 " @@ -11863,37 +12828,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið" -#: ../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 "" @@ -11906,105 +12889,142 @@ msgstr "Sjálfvirkt niðurhal" -#: ../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 +msgid "(deactivated)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 +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" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../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 "Vista WMS lag í skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Hlaða WMS lag úr skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Stillingar fyrir WMS viðbótina" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "WMS URL (Default)" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Afrita sjálfgefið val á minn lista" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Veldu hlut til að afrita fyrst." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Niðurhalsforrit:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +msgid "WMS Files (*.wms)" +msgstr "" #. * @@ -12364,62 +13384,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 "Tilvísun" - -#. 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 "Lag" #. item "Streets/Motorway" combo "Layer" @@ -12434,5 +13399,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 "Akreinar" @@ -12447,5 +13412,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" @@ -12455,10 +13419,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 "Hámarkshraði (km/klst)" @@ -12502,9 +13466,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 "Einstefnuvegur" @@ -12552,13 +13516,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 "Brú" @@ -12600,13 +13564,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 "Göng" @@ -12646,12 +13610,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 "Niðurgrafinn" @@ -12691,12 +13655,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 "Upphækkun" @@ -12852,17 +13816,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 "Breidd (í metrum)" @@ -12889,4 +13853,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" @@ -12905,11 +13870,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 "Slitlag" @@ -12919,4 +13885,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" @@ -12931,9 +13898,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 "malbikaður" @@ -12941,10 +13909,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 "ómalbikaður" + +#: 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 "Fjallakofi (e. Chalet)" + +#: 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 "Leiga" + +#. 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 "skógur" + +#: 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 "bílastæðavegur" #. item "Ways/Track Grade 2" combo "Surface" @@ -12952,12 +13983,93 @@ #: 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 "götusteinn" + +#: 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 "götusteinn" + +#: 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 "óklárað" + +#: 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 +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)" @@ -13038,20 +14150,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Vegtakmarkanir" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Breyti vegtakmörkunum" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Tollur" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "" @@ -13064,8 +14176,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 "Aðgangur" @@ -13100,32 +14212,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 "já" @@ -13138,40 +14265,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 "einkavegur" -#: 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 "" @@ -13184,19 +14311,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 "" @@ -13219,65 +14346,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 "leyfður" -#: 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 "í landbúnaðarskyni" -#: 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 "nei" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13292,10 +14424,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 "Hestar" @@ -13311,17 +14443,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 "Vélhjól" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13333,30 +14464,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 "Bifreið" -#: 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 "Lámarkshraði (km/klst)" @@ -13364,25 +14495,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 "Hámarksþyngt (í tonnum)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Hámarkshæð (í metrum)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Hámarksbreidd (í metrum)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Hámarkslengd (í metrum)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Hringtorg" @@ -13393,5 +14524,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 "Breyti hringtorgi" @@ -13407,5 +14538,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" #. @@ -13413,9 +14544,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 "Gerð" @@ -13435,10 +14566,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 "hraðbraut" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "tengibraut á hraðbraut" @@ -13460,10 +14591,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 "stofnvegur" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "" @@ -13485,10 +14616,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 "" @@ -13510,5 +14641,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" @@ -13523,9 +14654,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 "óflokkaður" @@ -13539,9 +14670,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "íbúðargata" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "vistgata" @@ -13571,10 +14702,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 "þjónustuvegur" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "" @@ -13604,6 +14735,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 "byggingarsvæði" @@ -13614,10 +14745,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 "Breyti brú" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Breyti göngum" @@ -13625,19 +14756,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Vegir" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Í byggingu" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Breyti veg í byggingu" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Hringtorg" @@ -13653,5 +14784,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "hringtorg" @@ -13660,5 +14791,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Reiðstígur" @@ -13666,5 +14797,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Breyti reiðstíg" @@ -13672,5 +14803,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Hjólastígur" @@ -13680,11 +14811,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 "Breyti hjólastíg" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Göngugata" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Göngustígur" @@ -13693,11 +14830,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Breyti göngustíg" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Tálmar" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Göngugata" @@ -13706,5 +14849,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Breyti göngugötu" @@ -13712,5 +14855,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Stigi" @@ -13720,5 +14863,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 "Breyti stiga" @@ -13727,5 +14870,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13734,39 +14877,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 "" @@ -13775,5 +14890,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13781,5 +14896,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13788,5 +14903,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13794,5 +14909,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13801,5 +14916,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13807,5 +14922,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13814,5 +14929,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13820,5 +14935,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13827,5 +14942,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13834,5 +14949,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "" @@ -13841,19 +14956,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 "" @@ -13863,5 +14981,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 "" @@ -13869,5 +14987,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -13877,5 +14995,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 "" @@ -13883,5 +15001,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -13891,5 +15009,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 "" @@ -13897,5 +15015,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -13905,5 +15023,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 "" @@ -13911,5 +15029,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -13919,5 +15037,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 "" @@ -13925,5 +15043,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -13933,5 +15051,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 "" @@ -13939,10 +15057,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Vegpunktar" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "" @@ -13950,15 +15068,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 "Tilvísun" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "" @@ -13966,5 +15084,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -13978,4 +15096,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" #. @@ -13995,18 +15115,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 "Rekstraraðili" @@ -14015,5 +15137,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Umferðarljós" @@ -14023,5 +15145,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -14030,27 +15152,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 "eyja" -#: 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 "" @@ -14058,6 +15180,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 "" @@ -14066,11 +15188,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 "" @@ -14078,30 +15200,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 "" @@ -14109,5 +15231,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Gangbraut" @@ -14116,14 +15238,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Smáhringtorg" @@ -14134,14 +15256,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 "Átt" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "réttsælis" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Beygjuhringur" @@ -14151,20 +15273,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 "Borgarmörk" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Breyti borgarmarkaskilti" #. 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 "Hraðamyndavél" @@ -14172,5 +15294,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Neyðarsími" @@ -14178,5 +15300,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14184,5 +15306,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14191,10 +15313,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Vað" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Breyti vaði" @@ -14202,5 +15324,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Skarð" @@ -14208,5 +15330,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Breyti skarði" @@ -14214,11 +15336,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 "Hæð (y/s)" @@ -14226,5 +15348,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Tálmar" @@ -14232,5 +15354,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14238,5 +15360,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14281,16 +15403,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 "Leyfileg umferð:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "" @@ -14299,5 +15421,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14305,5 +15427,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Rimlahlið" @@ -14311,10 +15433,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Breyti rimlahliði" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "" @@ -14322,15 +15444,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 "Tollskýli" @@ -14338,5 +15460,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Breyti tollskýli" @@ -14344,10 +15466,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Landamæraeftirlit" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Breyti landamæraeftirliti" @@ -14357,5 +15479,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Limgerði" @@ -14364,5 +15486,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14371,5 +15493,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "" @@ -14377,5 +15499,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Borgarveggur" @@ -14384,5 +15506,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14394,15 +15516,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Inngangur" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Breyti inngang" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Hlið" @@ -14410,50 +15532,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Breyti hliði" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Liftuhlið" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Breyti liftuhliði" #. 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 "" @@ -14461,25 +15583,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 "" @@ -14490,10 +15612,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 "Vatn" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Goshver" @@ -14501,5 +15623,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Breyti goshver" @@ -14507,5 +15629,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Frárennsli" @@ -14513,10 +15635,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Breyti frárennsli" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Lækur" @@ -14524,10 +15646,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Breyti læk" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Skipaskurður" @@ -14535,10 +15657,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Breyti skipaskurð" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Á" @@ -14548,5 +15670,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 "Breyti á" @@ -14554,15 +15676,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Breyti vatni" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Breyti landi" @@ -14570,15 +15692,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 "" @@ -14586,15 +15708,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 "" @@ -14602,5 +15724,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Árbakki" @@ -14609,10 +15731,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Breyti árbakka" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Votlendi" @@ -14623,14 +15745,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 "Breyti votlendi" #. 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 "" @@ -14644,35 +15766,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 "Leðja" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Breyti leðju" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Strönd" @@ -14680,20 +15802,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Breyti strönd" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Flói" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Breyti flóa" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Klettur" @@ -14701,10 +15823,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Breyti klett" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Strandlengja" @@ -14712,5 +15834,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Breyti strandlengju" @@ -14718,5 +15840,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Siglingarleið ferju" @@ -14724,5 +15846,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14731,5 +15853,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14737,10 +15859,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 "Skipakví" @@ -14748,5 +15870,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Breyti skipakví" @@ -14754,5 +15876,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Stífla" @@ -14760,15 +15882,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Breyti stíflu" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Vatnspunktar" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "" @@ -14777,5 +15899,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14783,20 +15905,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 "Foss" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Breyti fossi" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "" @@ -14805,15 +15927,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Smábátahöfn" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Breyti smábátahöfn" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Bryggja" @@ -14821,10 +15943,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Breyti bryggju" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "" @@ -14832,10 +15954,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 "" @@ -14845,5 +15967,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 "" @@ -14851,10 +15973,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 "" @@ -14862,5 +15984,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -14890,8 +16012,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 "" @@ -14905,35 +16027,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 "" @@ -14941,45 +16063,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 "" @@ -14987,5 +16109,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -14994,14 +16116,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 "" @@ -15010,5 +16132,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15017,5 +16139,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15025,5 +16147,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15031,5 +16153,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15038,10 +16160,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Skíðalyfta" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Stólalyfta" @@ -15049,10 +16171,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Breyti stólalyftu" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Toglyfta" @@ -15060,10 +16182,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Breyti toglyftu" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "" @@ -15071,10 +16193,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 "" @@ -15082,5 +16204,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15088,5 +16210,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 "" @@ -15097,10 +16219,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 "Bensínstöð" @@ -15110,9 +16232,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 "Breyti bensínstöð" #. 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 "Opnunartími" + +#. 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" @@ -15132,47 +16483,74 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Breyti stæði" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" -msgstr "" +#. 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 "Tilvísun" #. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "slitlag" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Merkja sem klárað" + +#. 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 +msgid "Capacity (overall)" +msgstr "" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 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 +#: build/trans_presets.java:1398 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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 "Bílaþvottastöð" #. item -#: build/trans_presets.java:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "Breyti bílaþvottastöð" @@ -15180,5 +16558,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "Búð" @@ -15186,15 +16564,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "Breyti bílabúð" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "" @@ -15202,5 +16580,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "Leiga" @@ -15209,10 +16587,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "Breyti bílaleigu" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "" @@ -15220,5 +16598,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "" @@ -15226,12 +16604,17 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" msgstr "Breyti hjólastæði" +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" +msgstr "" + #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Breyti hjólaleigu" @@ -15240,15 +16623,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Breyti hjólabúð" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Almenningssamgöngur" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Tilvísun" @@ -15256,5 +16639,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15262,5 +16645,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15268,5 +16651,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -15275,5 +16658,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -15281,5 +16664,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -15288,5 +16671,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -15298,5 +16681,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 "" @@ -15304,10 +16687,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 "" @@ -15316,10 +16699,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 "" @@ -15328,5 +16711,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Strætóstöð" @@ -15335,5 +16718,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Breyti strætóstöð" @@ -15341,5 +16724,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Strætóstopp" @@ -15349,5 +16732,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 "Breyti strætóstoppi" @@ -15356,8 +16739,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 "Skýli" @@ -15365,10 +16746,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 "" @@ -15376,5 +16757,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Leigubílastöð" @@ -15382,5 +16763,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Breyti leigubílastöð" @@ -15388,5 +16769,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Flugvöllur" @@ -15394,15 +16775,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Breyti flugvelli" #. 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 "" @@ -15411,5 +16792,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Gisting" @@ -15421,5 +16802,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hótel" @@ -15428,15 +16809,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Breyti hóteli" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stjörnur" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Vegahótel" @@ -15444,20 +16825,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Breyti vegahóteli" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Gistiheimili" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Breyti gistiheimili" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Fjallakofi (e. Chalet)" @@ -15465,10 +16846,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Farfuglaheimili" @@ -15476,30 +16857,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Breyti farfuglaheimili" #. 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 "Húsbílastæði" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Breyti húsbílastæði" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Tjaldstæði" @@ -15507,10 +16888,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Breyti tjaldstæði" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Matur & Drykkur" @@ -15521,5 +16902,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Veitingastaður" @@ -15527,5 +16908,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Breyti veitingastað" @@ -15533,5 +16914,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 "Matargerð" @@ -15539,61 +16920,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 "ítölsk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "kínversk" -#: 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 "grísk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "þýsk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indversk" -#: 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 "tyrknesk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asísk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "tælensk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexíkósk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japönsk" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Skyndibiti" @@ -15601,9 +16982,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Breyti skyndibitastað" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kaffihús" @@ -15611,10 +16992,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Breyti kaffihúsi" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Bar" @@ -15622,20 +17002,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Breyti bar" -#. 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 "" @@ -15643,10 +17021,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 "Næturklúbbur" @@ -15654,33 +17031,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Breyti næturklúbb" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Ferðamennska" #. 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 "Opnunartími" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Safn" @@ -15688,10 +17056,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Breyti safni" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Dýragarður" @@ -15700,10 +17067,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Breyti dýragarð" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Útsýnisstaður" @@ -15711,25 +17077,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Breyti útsýnisstað" #. 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 "Skemmtigarður" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Breyti skemmtigarð" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Listaverk" @@ -15737,5 +17102,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Breyti listaverki" @@ -15743,86 +17108,210 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Upplýsingamiðstöð" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Breyti upplýsingamiðstöð" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Kort" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Gerð korts" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "kort" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "borgarkort" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "göngukort" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "hjólakort" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "til" + +#. 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 "stræti" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "kínversk" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Niðurhalssvæði" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Líma" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Borg" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "Svæði" #. 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 "Nánari lýsing" #. 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 "Gosbrunnur" + +#. 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 "Skíði" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "bygging" + +#. 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 "Fræðsluskilti" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Viðfangsefni skiltisins" - -#. 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 "Landamæraeftirlit" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "Lögreglustöð" + +#: build/trans_presets.java:1737 msgid "history" msgstr "sagnfræði" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "náttúran" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "dýralíf" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "land" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Upplýsingar" + +#. 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 "Nánari lýsing" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Hljóð" + +#. +#: 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 "Húsnúmer" + +#. 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 "Breyti skýli" @@ -15830,25 +17319,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 "Eldstæði" #. 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 "Sögustaðir" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Kastali" @@ -15857,20 +17346,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Breyti kastala" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Rústir" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Breyti rústum" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Fornleifasvæði" @@ -15879,10 +17367,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Breyti fornleifasvæði" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Vígvöllur" @@ -15890,5 +17377,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Breyti vígvelli" @@ -15896,15 +17383,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Minnismerki" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Breyti minnismerki" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Minnisvarði" @@ -15912,45 +17399,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Breyti minnisvarða" #. 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 "Frístundir" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Vatnsleikjagarður" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Breyti vatnsleikjagarð" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Leikvöllur" @@ -15958,15 +17445,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Breyti leikvöll" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Fiskveiðar" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Breyti fiskveiðum" @@ -15974,15 +17461,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Íþróttamannvirki" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Íþróttaleikvangur" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Breyti íþróttaleikvang" @@ -15996,6 +17483,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 "veldu íþrótt:" @@ -16387,30 +17874,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 "íþrótt" @@ -16420,227 +17907,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 "bogfimi" -#: 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 "ástralskur fótbolti" -#: 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 "hafnabolti" -#: 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 "körfubolti" -#: 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 "klifur" -#: 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 "fótbolti" -#: 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 "hokkí" -#: 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 "skotfimi" -#: 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 "skautar" -#: 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 "skíði" -#: 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 "fótbolti" -#: 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 "sund" -#: 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 "borðtennis" -#: 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 "Íþróttamiðstöð" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Breyti íþróttamiðstöð" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Völlur" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Breyti velli" -#: 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 "Golfvöllur" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Breyti golfvelli" -#. 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 "Íþróttir" #. 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 "" @@ -16679,248 +18164,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 "völlur" -#: 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 "íþróttamiðstöð" -#: 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 "íþróttaleikvangur" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "Bogfimi" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Breyti bogfimi" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klifur" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Breyti klifri" -#: 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 "Skautar" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Breyti skautum" -#: 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 "Sund" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Breyti sundi" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Skíði" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Breyti skíðasvæði" #. 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 "Skotfimi" @@ -16928,178 +18405,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Breyti skotfimi" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Boltaíþróttir" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fótbolti" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Breyti fótbolta" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Amerískur fótbolti" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Breyti Amerískum fótbolta" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Ástralskur fótbolti" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Breyti Áströlskum fótbolta" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Hafnabolti" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Breyti hafnabolta" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Körfubolti" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Breyti körfubolta" -#: 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 "Hokkí" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Breyti hokkí" -#: 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 "Borðtennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Breyti borðtennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Breyti tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Byggingar" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bygging" @@ -17107,5 +18584,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Opinber bygging" @@ -17113,10 +18590,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Breyti opinberri byggingu" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Ráðhús" @@ -17124,10 +18601,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Breyti ráðhúsi" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Sendiráð" @@ -17135,10 +18612,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Breyti sendiráði" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Dómshús" @@ -17147,10 +18624,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Breyti dómshúsi" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Fangelsi" @@ -17159,10 +18636,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Breyti fangelsi" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Lögreglustöð" @@ -17172,10 +18649,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 "Breyti lögreglustöð" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Slökkvistöð" @@ -17184,10 +18661,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Breyti slökkvistöð" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Pósthús" @@ -17195,5 +18672,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Breyti pósthúsi" @@ -17201,15 +18678,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Leikskóli" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Breyti leikskóla" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Skóli" @@ -17217,10 +18694,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Breyti skóla" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Háskóli" @@ -17228,10 +18705,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Breyti háskóla" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Menntaskóli" @@ -17239,5 +18716,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Breyti menntaskóla" @@ -17245,5 +18722,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kvikmyndahús" @@ -17252,10 +18729,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Breyti kvikmyndahúsi" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bókasafn" @@ -17264,10 +18741,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Breyti bókasafni" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Listamiðstöð" @@ -17275,10 +18751,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Breyti listamiðstöð" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Leikhús" @@ -17287,10 +18763,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Breyti leikhúsi" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Helgistaður" @@ -17300,5 +18776,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 "Breyti helgistað" @@ -17307,6 +18783,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 "" @@ -17315,66 +18791,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 "" @@ -17383,81 +18859,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 "Heimilisfang" @@ -17466,5 +18942,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Breyti heimilisfangi" @@ -17472,5 +18948,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Húsnúmer" @@ -17478,20 +18954,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nafn húss" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Nafn bæjar" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Póstnúmer" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Landskóði" @@ -17499,5 +18975,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "" @@ -17506,5 +18982,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "" @@ -17512,71 +18988,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 "Mannvirki" #. 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 "Turn" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Breyti turni" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vatnsturn" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Breyti vatnsturni" #. 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 "Viti" @@ -17584,10 +19056,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Breyti vita" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Vindmylla" @@ -17595,10 +19067,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Breyti vindmyllu" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Leiðsla" @@ -17606,10 +19078,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Breyti leiðslu" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "" @@ -17619,10 +19091,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 "Krani" @@ -17630,10 +19102,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Breyti krana" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "" @@ -17641,10 +19113,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 "" @@ -17652,10 +19124,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 "Eftirlitsmyndavél" @@ -17663,5 +19135,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Breyti eftirlitsmyndavél" @@ -17669,5 +19141,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Rafall" @@ -17677,39 +19149,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 "Breyti rafli" #. 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 "Orkuver" @@ -17718,10 +19190,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Breyti orkuveri" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Spennustöð" @@ -17730,5 +19202,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Breyti spennustöð" @@ -17736,10 +19208,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 "Tilvísunarnúmer línunnar" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Háspennustaur" @@ -17750,5 +19222,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 "Breyti háspennustaur" @@ -17756,5 +19228,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Raflína" @@ -17763,46 +19235,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Breyti raflínu" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Volt" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Fjöldi víra" #. 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 "Salerni" -#. 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 "Tilvísun" - #. 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 "Athugasemd" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Póstkassi" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Almenningssími" @@ -17811,5 +19277,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Breyti almenningssíma" @@ -17817,5 +19283,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 "Mynt" @@ -17823,5 +19289,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 "Athugasemd" @@ -17829,5 +19295,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 "" @@ -17835,5 +19301,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 "Debetkort" @@ -17841,15 +19307,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 "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Símakort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Endurvinnsla" @@ -17858,5 +19324,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Breyti endurvinnslustöð" @@ -17864,80 +19330,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Rafhlöður" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Dósir" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Föt" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Gler" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Pappír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Brotajárn" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Bekkur" -#. 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 -msgid "Hide" -msgstr "" - -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 -msgid "Lock" -msgstr "" - -#. item "Amenities/Hunting Stand" check "Lock" +#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" +#. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2371 build/trans_presets.java:2771 +#: build/trans_presets.java:2438 build/trans_presets.java:2899 msgid "Height" msgstr "Hæð" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "low" msgstr "" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "half" msgstr "" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "full" msgstr "" -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2440 +msgid "Hide" +msgstr "" + +#: build/trans_presets.java:2441 +msgid "Lock" +msgstr "" + +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Gosbrunnur" @@ -17946,10 +19408,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Breyti gosbrunn" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Drykkjarvatn" @@ -17958,10 +19420,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Breyti drykkjarvatni" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Barnalúga" @@ -17969,25 +19431,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Breyti barnalúgu" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Verslanir" #. 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 "Fjallakofi (e. Chalet)" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "" @@ -17995,10 +19467,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 "Sjoppa" @@ -18006,10 +19477,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Breyti sjoppu" -#. 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 "Breyti strætóstoppi" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Breyti tré" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Sjálfsali" @@ -18017,5 +19507,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "" @@ -18023,88 +19513,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 "dagblöð" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "dót" -#: 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 "" -#: 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 "Slátrari" @@ -18112,10 +19602,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Breyti slátrara" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Bakarí" @@ -18123,10 +19612,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Breyti bakaríi" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Blómabúð" @@ -18134,20 +19622,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Breyti blómabúð" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Lífræn búð" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Breyti lífrænni búð" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "" @@ -18155,60 +19641,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 "Vínbúð" #. 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 "Tölvubúð" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Breyti tölvubúð" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Raftækjabúð" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Breyti raftækjabúð" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hljómtækjaverslun" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Breyti hljómtækjaverslun" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Húsgagnaverslun" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Breyti húsgagnaverslun" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "" @@ -18216,10 +19696,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 "" @@ -18227,10 +19706,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 "" @@ -18238,60 +19716,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 "Skrifstofuvörur" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Breyti skrifstofuvörum" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Hársnyrtir" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Breyti hársnyrti" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Skóbúð" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Breyti skóbúð" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Dótabúð" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Breyti dótabúð" -#. 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 "Efnalaug" @@ -18299,10 +19771,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Breyti efnalaug" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Þvottahús" @@ -18310,10 +19781,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Breyti þvottahúsi" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Útivistarbúð" @@ -18321,35 +19791,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Breyti útivistarbúð" -#. 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 "Breyti sjóntækjasmið" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Fjármál" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banki" @@ -18357,16 +19824,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Breyti banka" -#. 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 "Hraðbanki" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Gjaldeyrisskipti" @@ -18374,5 +19839,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Breyti gjaldeyrisskiptum" @@ -18380,15 +19845,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Breyti hraðbanka" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Heilsa" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Læknir" @@ -18396,20 +19861,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Breyti lækni" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Tannlæknir" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Breyti tannlækni" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apótek" @@ -18417,5 +19880,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Apótek" @@ -18423,10 +19886,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 "Spítali" @@ -18434,10 +19896,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Breyti spítala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "" @@ -18446,5 +19908,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18453,20 +19915,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 "" @@ -18474,5 +19936,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 "Dýralæknir" @@ -18481,55 +19943,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Breyti dýralækni" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Heimsálfa" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Breyti heimsálfu" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Breyti landi" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Fylki" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Breyti fylki" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Svæði" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Breyti svæði" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Sýsla" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Breyti sýslu" @@ -18537,15 +19999,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Borg" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Breyti borg" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Bær" @@ -18553,10 +20015,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Breyti bæ" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Hverfi" @@ -18564,25 +20026,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Breyti hverfi" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Þorp" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Breyti þorpi" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Smáþorp" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Breyti smáþorpi" @@ -18590,5 +20052,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18596,10 +20058,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 "Eyja" @@ -18607,11 +20069,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Breyti eyju" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "skali" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Hellismunni" @@ -18619,10 +20094,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Breyti hellismunna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Tindur" @@ -18630,10 +20105,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Breyti tind" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Jökull" @@ -18641,10 +20116,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Breyti jökli" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Eldfjall" @@ -18652,70 +20127,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Breyti eldfjalli" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" -msgstr "" +msgstr "Landamæri" #. 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 "Breyti landamærum þjóðgarðs" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Landnýting" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Tré" @@ -18724,15 +20199,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Breyti tré" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Fræðiheiti" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Skógur" @@ -18741,5 +20216,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Breyti skóg" @@ -18747,17 +20222,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 "barrskógur" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "laufskógur" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "blandaður" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Skógur (ræktaður)" @@ -18766,14 +20241,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Breyti ræktuðum skóg" -#: 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 "" @@ -18781,25 +20256,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 "" @@ -18807,10 +20282,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 "" @@ -18818,5 +20293,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "" @@ -18824,5 +20299,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -18831,45 +20306,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 "" @@ -18877,25 +20352,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Garður" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Breyti garði" #. 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 "" @@ -18903,10 +20378,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 "" @@ -18914,20 +20389,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 "Almenningsgarður" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Breyti almenningsgarð" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "" @@ -18935,5 +20410,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -18941,15 +20416,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Íbúðarsvæði" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Breyti íbúðarlandnýtingu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Grafreitur" @@ -18957,9 +20432,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Breyti grafreit" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "" @@ -18967,39 +20442,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Breyti kirkjugarðslandnýtingu" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Smásala" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Breyti smásölulandnýtingu" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Skrifstofur" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Breyti skrifstofulandnýtingu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Iðnaður" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Breyti iðnaðarlandnýtingu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "" @@ -19007,15 +20482,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 "" @@ -19023,55 +20498,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Byggingarsvæði" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Breyti byggingarsvæðislandnýtingu" #. 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 "" @@ -19081,5 +20556,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 "" @@ -19088,10 +20563,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 "" @@ -19099,5 +20574,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19106,5 +20581,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19112,34 +20587,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 "aðeins_beint_fram" @@ -19148,15 +20623,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "af vegi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "gegnum hnút eða veg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "að vegi" @@ -19164,5 +20639,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19171,5 +20646,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19177,5 +20652,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19247,5 +20722,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 @@ -19254,17 +20729,17 @@ msgstr "hjól" -#: 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 "" @@ -19317,5 +20792,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 @@ -19324,13 +20799,13 @@ msgstr "fótgangandi" -#: 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 "" @@ -19344,10 +20819,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 "" @@ -19355,31 +20830,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 "" @@ -19388,30 +20863,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 "" @@ -19849,11 +21324,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 "" @@ -20179,41 +21654,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 "stræti" #. color street @@ -21914,5 +23352,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 "" @@ -22511,55 +23949,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22573,5 +23962,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 "ferðamennska" @@ -22643,8 +24032,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 "" @@ -22715,8 +24104,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 "" @@ -22730,5 +24119,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "" @@ -22742,5 +24131,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22762,5 +24151,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22774,5 +24163,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "skógur (ræktaður)" @@ -22786,5 +24175,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22807,5 +24196,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "smásala" @@ -22819,5 +24208,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "iðnaður" @@ -22831,5 +24220,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22843,5 +24232,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22855,5 +24244,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -22910,7 +24299,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 "" @@ -22924,5 +24313,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "" @@ -22935,5 +24324,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "tindur" @@ -22948,5 +24337,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "jökul" @@ -22960,5 +24349,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "eldfjall" @@ -23013,8 +24402,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 "" @@ -23028,5 +24417,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23040,19 +24429,7 @@ #. #. -#: 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 "skógur" #. color water @@ -23064,5 +24441,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "leðja" @@ -23076,5 +24453,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "strönd" @@ -23152,8 +24529,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 "" @@ -23201,7 +24578,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 "" @@ -23343,10 +24720,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 "" @@ -23394,6 +24780,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 "" @@ -23690,4 +25076,45 @@ msgstr "" +#~ msgid "nodes" +#~ msgstr "hnútar" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?" + +#~ msgid "Delete all" +#~ msgstr "Eyða öllum lögunum" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Eyði lagi {0} af {1}" + +#~ msgid "Public" +#~ msgstr "Sýnilegur öllum" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á " +#~ "openstreetmap.org" + +#~ msgid "Edit Information Office" +#~ msgstr "Breyti upplýsingamiðstöð" + +#~ msgid "Map Type" +#~ msgstr "Gerð korts" + +#~ msgid "map" +#~ msgstr "kort" + +#~ msgid "citymap" +#~ msgstr "borgarkort" + +#~ msgid "hikingmap" +#~ msgstr "göngukort" + +#~ msgid "bicyclemap" +#~ msgstr "hjólakort" + +#~ msgid "Board Type" +#~ msgstr "Viðfangsefni skiltisins" + #~ msgid "Aborting..." #~ msgstr "Hætti við..." @@ -23695,7 +25122,4 @@ #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." - -#~ msgid "Not implemented yet." -#~ msgstr "Óútfært." #~ msgid "OSM username (email)" @@ -23739,7 +25163,4 @@ #~ msgstr "Árekstrar: {0}" -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Leysa {0} árekstra í {1} hlutum" - #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 17484) +++ /applications/editors/josm/i18n/po/it.po (revision 17485) @@ -5,6 +5,6 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" -"PO-Revision-Date: 2009-08-10 13:15+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-20 09:04+0000\n" "Last-Translator: Davide Prade \n" "Language-Team: Italian \n" @@ -13,21 +13,21 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Creazione dell'interfaccia principale" #. 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 "Aiuto" -#: ../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" @@ -35,56 +35,59 @@ "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore" -#: ../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 @@ -94,157 +97,162 @@ #: ../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 "Errore" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati sul " -"server." - -#: ../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] "" +"Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?" +msgstr[1] "" +"Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Modifiche non salvate" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "" -"Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?" - -#: ../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 "Salva ed Esci" -#: ../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 "Annulla ed Esci" -#: ../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 "Annulla" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{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 "Attenzione" -#: ../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 "Ignorato un indirizzo URL di file malformato: \"{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 "Impossibile leggere il file ''{0}''. L''errore è:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -269,7 +277,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" @@ -307,5 +316,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" @@ -329,6 +338,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 "Estensioni" @@ -343,8 +352,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 "" "ATTENZIONE: formato inatteso per l' URL di base delle API. Il " @@ -352,9 +361,19 @@ "probabilmente non funzionerà. L' URL di base per le api è: {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 "" +"ATTENZIONE: formato inatteso per l' URL di base delle API. Il " +"reindirizzamento della pagina della storia delle primitive di OSM " +"probabilmente non funzionerà. L' URL di base per le api è: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Selezionare almeno un nodo, percorso o relazione già caricato." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -365,5 +384,5 @@ "delle {1} primitive selezionate" -#: ../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 "Selezionare il livello di riferimento." @@ -373,11 +392,11 @@ msgstr "Seleziona il livello di riferimento." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Unisci" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -387,5 +406,5 @@ "Non ci sono livelli al quale unire il livello sorgente ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Nessun livello di riferimento" @@ -402,11 +421,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 @@ -435,5 +454,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 "Latitudine" @@ -442,30 +461,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 "Longitudine" +#: ../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 "Disponi i nodi in cerchio" -#: ../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 "Sposta i nodi selezionati disponendoli su un cerchio." -#: ../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 @@ -479,6 +498,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 @@ -486,58 +505,57 @@ msgstr "Strumenti: {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 "Selezionare almeno quattro nodi." #. 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 "Informazioni" #. 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 "Disponi i nodi in linea" -#: ../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 "Sposta i nodi selezionati disponendoli su una linea." -#: ../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 "Selezionare almeno tre nodi." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -548,10 +566,10 @@ "sono {0}, il massimo è {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 "Violazione delle capacità delle API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -562,5 +580,5 @@ "cancellata {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -571,9 +589,9 @@ "massima lunghezza ammessa {2}. La lunghezza del valore è {3}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Violazione della precondizione" -#: ../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}" @@ -582,37 +600,37 @@ "permesso {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "dati" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "layer" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "selezione" -#: ../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 "conflitto" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "scarica" +#: ../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 "Zoom a {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 "Fa lo zoom della vista a {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 @@ -622,22 +640,22 @@ msgstr "Visualizza: {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 "Nessuna selezione da ingrandire" -#: ../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 "Nessun conflitto da ingrandire" +#: ../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 "Unisci percorso" -#: ../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 "Unisce diversi percorsi in uno." -#: ../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 "Selezionare almeno due percorsi da unire." @@ -648,4 +666,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Unisci comunque" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -655,19 +677,7 @@ "unirli?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Unisci comunque" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Inverti direzione?" - -#: ../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 "" -"I percorsi non possono essere uniti con le direzioni attuali. Vuoi invertire " -"la direzione di qualcuno?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -675,27 +685,34 @@ msgstr "Inverti direzione e unisci" -#: ../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 "" +"I percorsi non possono essere uniti con le direzioni attuali. Vuoi invertire " +"la direzione di qualcuno?" + +#: ../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 "Inserire dei valori per tutti i conflitti." -#: ../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 "Risolvi conflitti" -#: ../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 "Unisci {0} percorsi" -#: ../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 "Tutti i percorsi erano vuoti" -#: ../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 " @@ -705,32 +722,32 @@ "nodi)" +#: ../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 "Copia" -#: ../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 "Copia gli oggetti selezionati all'interno del buffer" -#: ../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 "Seleziona qualcosa da copiare." +#: ../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 "Crea cerchio" -#: ../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 "Crea un cerchio a partire da tre nodi selezionati" -#: ../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 "Questi nodi non sono disposti su una circonferenza. Annullo." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -742,20 +759,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 "Cancella" @@ -765,63 +782,64 @@ msgstr "Cancella gli oggetti selezionati." -#: ../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 "Sovrascrivi" -#: ../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 "Il file esiste. Sovrascriverlo?" #. 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 "Disponi i nodi" -#: ../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 "Disponi i nodi a distanze regolari lungo una linea" +#: ../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 "Scarica da 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 "Scarica i dati della mappa dal server 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 "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Scarica" -#: ../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 "Selezionare almeno un compito per scaricare" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Scarica riferimenti da 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 "" @@ -829,23 +847,23 @@ "selezionate" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Scarica riferimenti..." -#: ../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 "Ci sono stati {0} conflitti durante l'importazione" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Conflitti durante lo scaricamento" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -854,6 +872,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 "Duplica" @@ -877,86 +895,92 @@ msgstr "Esci dall'applicazione." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Tutte le immagini" + +#: ../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 "Esporta in 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 "Esporta i dati in un file 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 "Niente da esportare. Prima è necessario ottenere dei dati." -#: ../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 "il parametro ''{0}'' non deve essere nullo" -#: ../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 "" -#: ../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 "Esporta file GPX" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Guida in linea di 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 "Apri nel Browser" -#: ../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 "Modifica" -#: ../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 "Ricarica" -#: ../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 "" "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM" -#: ../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 "Errore durante il caricamento della pagina {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." msgstr "Pagina di help mancante. Creala in italiano." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1012,22 +1036,26 @@ msgstr "Unisci il livello corrente con un altro livello" +#: ../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 "Fondi nodi" -#: ../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 "Unisci i nuovi nodi in quello più vecchio." -#: ../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 "Seleziona almeno due nodi da unire." -#: ../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 "Unire i nodi con diffenti appartenenze?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Incorpora comunque" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1036,77 +1064,73 @@ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Incorpora comunque" - -#: ../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 "Impossibile unire i nodi. Cancellare un percorso attualmente usato." -#: ../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 "Unisci {0} nodi" +#: ../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 "Unisci selezione" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Unisci le primitive attualmente selezionate con un altro livello" +#: ../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 "Rispecchia" -#: ../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 "Rispecchia i nodi ed i percorsi selezionati." -#: ../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 "Selezionare almeno un nodo o percorso." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "su" -#: ../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 "Sposta oggetti {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "giù" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "sinistra" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "destra" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Muovi {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 "Sposta Oggetti {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 "Impossibile spostare degli oggetti fuori dal mondo." @@ -1114,5 +1138,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 "Nuovo" @@ -1122,17 +1146,22 @@ msgstr "Crea una nuova mappa." -#: ../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 "Apri..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Apri un file." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Impossibile leggere il file ''{0}''. L''errore è:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Apri un file." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Ruolo ''{0}'' sconosciuto." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1171,22 +1200,17 @@ "Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Sono permessi solo due nodi" -#: ../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 "La selezione deve comprendere solo percorsi." -#: ../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 "Selezionare uno o più percorsi chiusi di almeno quattro nodi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti." - -#: ../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 " @@ -1195,9 +1219,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 "Solo un nodo selezionato" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Disponi ortogonalmente" @@ -1213,13 +1237,26 @@ msgstr "Incolla il contenuto memorizzato" -#: ../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 "Incolla le etichette" -#: ../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 "Applica le etichette memorizzate a tutti gli elementi selezionati" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Caricamento {0}" +msgstr[1] "Caricamento {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Ripristina {0} primitive" +msgstr[1] "Ripristina {0} primitive" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1245,37 +1282,32 @@ msgstr "Rifa l'ultima azione annullata." -#: ../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 "Rinomina livello" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Rinomina anche il file" -#: ../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 "" - +msgstr "Impossibile rinominare il file ''{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 "Inverti la direzione dei percorsi" -#: ../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 "Inverti la direzione di tutti i percorsi selezionati" -#: ../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 "Selezionare almeno un precorso." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Inverti la direzione dei percorsi" @@ -1283,10 +1315,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 "Salva" #: ../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 "Salva i dati attuali." @@ -1297,37 +1330,25 @@ msgstr "Il file {0} esiste. Sovrascrivere?" -#: ../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 "" -"Errore Interno: impossibile controllare le condizioni dei layer. Segnala " -"questo come bug." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Nessun documento è aperto per cui non c'è niente da salvare." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Documento vuoto" -#: ../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 "Il documento non contiene dati" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Salva comunque" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflitti" -#: ../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 " @@ -1337,28 +1358,28 @@ "gestiti come se si fossero stati tutti rifiutati. Continuare?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Rifiuta i conflitti e Salva" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Salva file OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Salva in un file GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Salva livello" +#: ../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 "Salva come..." -#: ../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 "Salva i dati correnti su un nuovo file." @@ -1393,33 +1414,33 @@ msgstr "Aiuto: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Rapporto dello stato" -#: ../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 "Copia negli appunti e chiudi" -#: ../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 "Chiudi" +#: ../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 "Dividi percorso" -#: ../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 "Divide un percorso al nodo selezionato." -#: ../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 "La selezione attuale non può essere usata per la divisione." -#: ../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." @@ -1427,5 +1448,5 @@ msgstr[1] "I nodi selezionati non sono parte di alcun percorso." -#: ../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 " @@ -1441,9 +1462,9 @@ "percorso." -#: ../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 "I nodi selezionati non condividono il medesimo percorso." -#: ../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." @@ -1451,10 +1472,10 @@ msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati." -#: ../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 "Seleziona due o più nodi per dividere un percorso circolare." -#: ../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 " @@ -1464,5 +1485,5 @@ "seleziona i nodi in mezzo al percorso)." -#: ../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 " @@ -1470,5 +1491,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 " @@ -1476,8 +1497,34 @@ 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 "Dividi il percorso {0} in {1} parti" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Chiusura del gruppo di modifiche..." + +#: ../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 "Chiusura del gruppo di modifiche..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "Non c'è al momento alcun livello WMS da regolare." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Apertura del gruppo di modifiche..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Chiusura del gruppo di modifiche..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1495,47 +1542,47 @@ msgstr "Attiva o disattiva l''impostazione globale ''{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 "Separa percorsi" -#: ../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 "Duplica i nodi usati da più percorsi." -#: ../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 "Questo nodo non è attaccato ad altri elementi." -#: ../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 "Nessuno di questi nodi è attaccato ad altri elementi." -#: ../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 "Nessun nodo di questo percorso è attaccato ad altri elementi." -#: ../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 "La selezione corrente non può essere utilizzata per la separazione." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Selezionare uno di questi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Un nodo etichettato, oppure" -#: ../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 "* Un nodo che è usato da più di un percorso, oppure" +#: ../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 "" +"* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" + #: ../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 "" -"* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" - -#: ../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" @@ -1544,5 +1591,5 @@ "oppure" -#: ../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." @@ -1551,5 +1598,5 @@ "percorso." -#: ../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" @@ -1564,9 +1611,9 @@ "e tutti i nodi saranno selezionati." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nodo staccato" -#: ../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" @@ -1574,5 +1621,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" @@ -1618,61 +1665,71 @@ "dati)" -#: ../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 "Aggiornamento dei dati" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Aggiorna la selezione" -#: ../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 "Aggiorna le primitive attualmente selezionate dal server" -#: ../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 "Non c'è alcuna primitiva selezionata per l'aggiornamento." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Selezione vuota" -#: ../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 "Carica su 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 "Carica tutti i cambiamenti sul server 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 "Ci sono dei conflitti non risolti. Prima è necessario risolverli." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Niente da caricare. Prima è necessario ottenere dei dati." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Ci sono dei conflitti non risolti. Prima è necessario risolverli." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Nessun cambiamento da caricare." -#: ../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 "Sincronizza solamente {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 "Sincronizza l'intero dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1695,17 +1752,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 "Rilevato un conflitto" #. 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 "Valore di ritorno inatteso. Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1721,5 +1778,5 @@ "continuare ad apportare delle modifiche.
" -#: ../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}\"" @@ -1728,5 +1785,5 @@ "atteso \"{1}\"" -#: ../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}\"" @@ -1734,54 +1791,144 @@ "L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{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 "Upload fallito.
{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 "Invio alle API di OSM fallito" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Aggiornamento della primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Caricare questi cambiamenti?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Carica le modifiche" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Modifica la nuova relazione nel layer ''{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 "Aggiungi un nodo ad un percorso esistente" + +#: ../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 "carica tutte le modifiche in una sola richiesta" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " "changed primitive" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +"Abilitare per caricare tutte le modifiche in una sola richiesta, " +"disabilitare per utilizzare una richiesta per ogni singola primitiva " +"modificata" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Crea un breve commento ai cambiamenti che sta caricando:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Impostazioni della mappa" + +#: ../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 "gruppo di modifiche" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Oggetti da aggiungere:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Oggetti da modificare:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Oggetti da eliminare:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Crea un breve commento ai cambiamenti che sta caricando:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Caricare questi cambiamenti?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Carica le modifiche" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Invio in corso" +#: ../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] "Oggetti da aggiungere:" +msgstr[1] "Oggetti da aggiungere:" + +#: ../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] "Oggetti da modificare:" +msgstr[1] "Oggetti da modificare:" + +#: ../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] "Oggetti da eliminare:" +msgstr[1] "Oggetti da eliminare:" + +#: ../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 "Ultima modifica {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1805,20 +1952,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 "Audio: {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 "Più veloce" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Avanti più veloce" @@ -1860,10 +2007,10 @@ msgstr "Esegui contrassegno precedente" -#: ../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 "Più lento" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Avanzamento lento" @@ -1891,31 +2038,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 "Nessun dato importato." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Dati 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 "Scaricamento di {0} su {1} ({2} rimanenti)" -#: ../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 "Errori durante lo scaricamento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1927,20 +2070,20 @@ msgstr "" -#: ../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 "Primitive eliminate o spostate" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Modalità Cancella" -#: ../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 "Cancella nodi o percorsi." -#: ../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 @@ -1949,5 +2092,5 @@ msgstr "Modalità: {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 " @@ -1958,55 +2101,69 @@ "gli oggetti che si riferiscono a questo." -#: ../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 "" - +msgstr "il parametro ''{0}'' non deve essere nullo" + +#: ../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 "Disegna" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Disegna i nodi" -#: ../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 "Modalità: Disegna centro" -#: ../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 @@ -2014,38 +2171,38 @@ msgstr "selezionato" -#: ../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 "Non si può disegnare un nodo fuori dal mondo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Aggiungi nodo" -#: ../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 "Aggiungi un nodo al percorso" -#: ../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 "Collega un percorso esistente al nodo" -#: ../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 "Aggiungi un nodo ad un percorso esistente" -#: ../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 "Aggiungi un nodo al percorso e connetti" -#: ../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 "Crea un nuovo nodo." -#: ../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 "Seleziona il nodo sotto il cursore." -#: ../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." @@ -2054,14 +2211,14 @@ msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi." -#: ../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 "Inizia un nuovo percorso dall'ultimo nodo." -#: ../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 "Continua un percorso dall'ultimo nodo." -#: ../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 "Termina tracciamento." @@ -2081,5 +2238,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 "" @@ -2094,5 +2251,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 "Rilascia il bottone del mouse per interrompere la rotazione." @@ -2113,17 +2270,18 @@ "quel punto." +#: ../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 "Seleziona" -#: ../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 "Seleziona, muovi e ruota gli oggetti." -#: ../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" @@ -2132,13 +2290,21 @@ msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Muovi elementi" -#: ../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 "Muoverli" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Annullare lo spostamento" + +#: ../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 "" @@ -2147,13 +2313,9 @@ "Si è sicuri di volerli muovere?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Muoverli" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Annullare lo spostamento" - -#: ../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." @@ -2162,5 +2324,5 @@ "più vicino." -#: ../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,63 +2351,63 @@ "di ingrandimento con il tasto destro" +#: ../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 "Cerca..." -#: ../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 "Cerca degli oggetti." -#: ../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 "Inserire una stringa di ricerca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "Sostituisci la selezione" -#: ../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 "Aggiungi alla selezione" -#: ../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 "Rimuovi dalla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "Distingui maiuscole" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "espressione regolare" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Via Nazionale - ''Via'' e ''Nazionale'' in qualunque chiave o nome." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Via Nazionale - ''Via'' e ''Nazionale'' in qualunque chiave o nome." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Via Nazionale\" - ''Via Nazionale'' in qualunque chiave o nome." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Via Nazionale\" - ''Via Nazionale'' in qualunque chiave o nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Naz - ''Naz'' in qualunque punto del nome." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" +"type=route - chiave 'type' che contiene esattamente il valore 'route'." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" -"type=route - chiave 'type' che contiene esattamente il valore 'route'." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2255,51 +2417,52 @@ "*=value, 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:Naz - ''Naz'' non presente all''interno del nome." -#: ../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: - chiave=foot impostata con qualunque valore." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Ricerche speciali:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - tipo dell''oggetto (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - tipo dell''oggetto (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - tutti gli oggetti modificati dall''utente" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - oggetto con un dato ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - oggetto con un dato ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - oggetto con un dato numero di nodi" -#: ../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 - tutti gli oggetti modificati" -#: ../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 - tutti gli oggetti selezionati" -#: ../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 - tutti gli oggetti incompleti" -#: ../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 "untagged - tutti gli oggetti provi di proprietà" -#: ../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" @@ -2308,5 +2471,5 @@ "corrispondenti all'espressione" -#: ../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" @@ -2315,5 +2478,5 @@ "corrispondenti all'espressione" -#: ../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 "" @@ -2321,5 +2484,5 @@ "logico ''or''" -#: ../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 "" @@ -2327,46 +2490,46 @@ "contiene :)" -#: ../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 "Utilizzare ( e ) per raggruppare le espressioni" -#: ../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 "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../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 "Nessuna corrispondenza trovata per ''{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 "Nulla è stato aggiunto alla selezione cercando ''{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 "Nulla è stato rimosso dalla selezione cercando ''{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 "Trovate {0} corrispondenze" -#: ../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" @@ -2437,58 +2600,96 @@ msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Carica selezione" -#: ../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 "Collegamento a {0} in corso..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Scaricamento in corso..." -#: ../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 "Impossibile leggere \"{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 "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{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 "Errore durante la comunicazione con il server" -#: ../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 "Aggiungi nodo" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Aggiungere {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 "Relazioni: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Cambiare {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 "Cambiare {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Cambia relazione" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Rimuovi \"{0}\" per {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Rimuovi \"{0}\" per {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 "Rimuovi \"{0}\" per {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Imposta {0}={1} per {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 "Imposta {0}={1} per {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Imposta {0}={1} per {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" @@ -2497,10 +2698,10 @@ msgstr[1] "oggetti" -#: ../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 "Rimuovi \"{0}\" per {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}" @@ -2512,5 +2713,5 @@ msgstr "Cambiare il membro della relazione per {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2519,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 "Doppio conflitto" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2531,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}''" @@ -2555,44 +2756,60 @@ msgstr "non è possibile risolvere il conflitto irrisolto" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Cancella {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Cancella {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] "Cancella {0} {1}" +msgstr[1] "Cancella {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] "Modalità Cancella" +msgstr[1] "Modalità Cancella" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Cancella {0} {1}" +msgstr[1] "Cancella {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] "Elimina dalla relazione" +msgstr[1] "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Conflitto tra relazioni" -#: ../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 "Elimina dalla relazione" + +#: ../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 "" "La selezione \"{0}\" è usata dalla relazione \"{1}\" con le regole {2}.\n" "Cancellare dalla relazione?" -#: ../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 "Elimina dalla relazione" - -#: ../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 "" "La selezione \"{0}\" è usata dalla relazione \"{1}\".\n" "Cancellare dalla relazione?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Dividi il segmento del percorso" @@ -2600,6 +2817,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." @@ -2611,7 +2828,7 @@ "(che non puoi vedere).
Vuoi veramente cancellarli?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" -msgstr "" +msgstr "Conferma di cancellazione" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 @@ -2620,10 +2837,10 @@ msgstr "Risolvi conflitti nello stato eliminato in {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" msgid_plural "Move {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Sposta {0} nodo" +msgstr[1] "Sposta {0} nodi" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 @@ -2653,15 +2870,25 @@ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Rimuovere il membro della relazione {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" msgid_plural "Rotate {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ruota {0} nodo" +msgstr[1] "Ruota {0} nodi" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 @@ -2669,17 +2896,37 @@ msgstr "Sequenza" -#: ../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 "Risolvi {0} conflitti sulle etichette in {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 "Risolvi {0} conflitti sulle etichette in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Ripristina {0} primitive" -#: ../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 "Risolvi i conflitti di versione per {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Risolvi i conflitti di versione per {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Risolvi i conflitti di versione per {0} {1}" @@ -2707,13 +2954,13 @@ "consistenza dei dati." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relazione" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Vecchia regola" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nuova regola" @@ -2732,64 +2979,121 @@ #: ../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 "Nuovo valore" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Applica i cambiamenti selezionati" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Non applicare cambiamenti" -#: ../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 "Selezionare quali cambiamenti alle proprietà si vogliono applicare." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Proprietà di " -#: ../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 "Regole nelle relazioni a cui si riferiscono" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Correzione automatica etichette" -#: ../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 "Errore di formato nel file di configurazione alla linea {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Impossibile aprire la cartella delle preferenze: {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 "" "Il file delle preferenze contiene degli errori. Copia di backup del vecchio " "file su {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 "Preferenze salvate in {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 "Impossibile caricare le preferenze. Motivo: {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 "Impossibile scaricare le preferenze dal server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2803,29 +3107,36 @@ msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" -#: ../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 "Gradi Decimali" -#: ../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 "Gradi Minuti Secondi" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../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}" @@ -2837,15 +3148,229 @@ msgstr "è richiesto il parametro {0} > 0. Ottenuto {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 "incompleto" - -#: ../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 "Errore: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Attenzione: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "non c'è alcuna primitiva con versione {0} in questo storico" + +#: ../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 "Non c'è alcuna versione valida alla data ''{0}'' in questo storico" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "non è stata trovata la versione più recente. Lo storico è vuoto." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "" + +#: ../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 "" + +#: ../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 "era atteso il parametro ''{0}'' > 0, ottenuto ''{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 "" + +#: ../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 "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Il percorso dello stile dell''area non è chiuso." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "il percorso multi-poligonale ''{0}'' non è chiuso." + +#. 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 "Membro vuoto nella relazione." + +#: ../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 "Eliminato il membro ''{0}'' nella relazione." + +#: ../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 "Percorso ''{0}'' con meno di due punti." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "E' stato trovato più di un percorso \"from\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "E' stato trovato più di un percorso \"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 "E' stata trovata più di una \"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 "Ruolo ''{0}'' sconosciuto." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Tipo di membro sconosciuto per ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Non è stato trovato un percorso \"from\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Non è stato trovato un percorso \"to\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Non è stato trovato alcun nodo o percorso \"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 "Il percorso \"from\" non inizia o non finisce su un nodo \"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 "Il percorso \"to\" non inizia o finisce su un nodo \"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 "Il percorso \"from\" non inizia o finisce sul percorso \"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 "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Non è stato trovato lo stile per la restrizione {0}." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Non-percorso ''{0}'' nel multi-poligono." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Nessun percorso esterno per il multi-poligono ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Il percorso interno ''{0}'' è esterno." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Lo stile per il percorso esterno ''{0}'' è discordante." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "senza etichetta" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "testo" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inattivo" + #: ../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" @@ -2854,22 +3379,7 @@ msgstr[1] "nodi" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Errore: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Attenzione: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nodi" - -#: ../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" @@ -2878,12 +3388,7 @@ msgstr[1] "percorsi" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "vie" - -#: ../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" @@ -2892,246 +3397,4 @@ msgstr[1] "relazioni" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relazioni" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "gruppo di modifiche" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "gruppi di modifiche" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} membro" -msgstr[1] "{0} membri" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "strada" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "ferrovia" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "corso d'acqua" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "tipologia di area" - -#: ../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} nodo" -msgstr[1] "{0} nodi" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "non c'è alcuna primitiva con versione {0} in questo storico" - -#: ../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 "Non c'è alcuna versione valida alla data ''{0}'' in questo storico" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "non è stata trovata la versione più recente. Lo storico è vuoto." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "" - -#: ../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 "" - -#: ../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 "era atteso il parametro ''{0}'' > 0, ottenuto ''{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 "" - -#: ../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 "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Il percorso dello stile dell''area non è chiuso." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "il percorso multi-poligonale ''{0}'' non è chiuso." - -#. 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 "Membro vuoto nella relazione." - -#: ../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 "Eliminato il membro ''{0}'' nella relazione." - -#: ../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 "Percorso ''{0}'' con meno di due punti." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "E' stato trovato più di un percorso \"from\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "E' stato trovato più di un percorso \"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 "E' stata trovata più di una \"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 "Ruolo ''{0}'' sconosciuto." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Tipo di membro sconosciuto per ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Non è stato trovato un percorso \"from\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Non è stato trovato un percorso \"to\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Non è stato trovato alcun nodo o percorso \"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 "Il percorso \"from\" non inizia o non finisce su un nodo \"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 "Il percorso \"to\" non inizia o finisce su un nodo \"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 "Il percorso \"from\" non inizia o finisce sul percorso \"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 "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Non è stato trovato lo stile per la restrizione {0}." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Non-percorso ''{0}'' nel multi-poligono." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Nessun percorso esterno per il multi-poligono ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Il percorso interno ''{0}'' è esterno." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Lo stile per il percorso esterno ''{0}'' è discordante." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "senza etichetta" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "testo" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inattivo" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3144,5 +3407,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "sfondo" @@ -3152,7 +3415,7 @@ msgstr "evidenzia" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" -msgstr "" +msgstr "WGS84 Geografico" #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 @@ -3160,5 +3423,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3174,21 +3437,21 @@ "e crea un nuovo layer sulla nuova zona." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Zona di Lambert (Francia)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Zona di Lambert (Estonia)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Grigliato svizzero (Svizzera)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3208,9 +3471,9 @@ #: ../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 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Impossibile leggere il file ''{0}''. L''errore è:
{1}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3218,12 +3481,60 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Non mostrare di nuovo" -#: ../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/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 "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "strada" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "ferrovia" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "corso d'acqua" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "tipologia di area" + +#: ../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} nodo" +msgstr[1] "{0} nodi" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} membro" +msgstr[1] "{0} membri" + +#: ../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 "" "E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " @@ -3232,5 +3543,43 @@ "propria connessione ad 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 "sconosciuto" + +#: ../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 "" @@ -3242,36 +3591,9 @@ "usato
viola una precondizione.
Il messaggio di errore é:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Violazione della precondizione" -#: ../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 "sconosciuto" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3281,9 +3603,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 "" @@ -3292,9 +3614,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +msgstr "Eccezione di rete" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3303,9 +3625,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 +msgstr "Eccezione di IO" + +#: ../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 "" @@ -3315,9 +3648,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Host sconosciuto" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3330,12 +3663,7 @@ "messaggio di errore è:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitiva già eliminata" - -#: ../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 @@ -3352,38 +3680,38 @@ msgstr "Scaricamento del \"messaggio del giorno\"" -#: ../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 "Carica preferenze" -#: ../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 "Carica sul server le attuali preferenze" -#: ../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 "stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nome dell'utente." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Password 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 "Ridimensiona l'applet alla geometria data (formato: LARGHEZZAxALTEZZA)" -#: ../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 "stringa;stringa;..." -#: ../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 " @@ -3393,5 +3721,5 @@ "o un nome di file" -#: ../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 " @@ -3401,5 +3729,5 @@ "lat=y&lon=x&zoom=z o un nome di file" -#: ../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 " @@ -3409,76 +3737,95 @@ "simile a quelel di Google o un URL che restituisce osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "qualsiasi" -#: ../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 "Se specificato, reimposta la configurazione invece di leggerla." -#: ../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 "Nome utente" -#: ../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 "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opzioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Mostra questo aiuto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Dimensioni e posizione della finestra (secondo lo standard 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 "Scarica la zona delimitata dal riquadro di selezione" -#: ../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 "Scarica la zona indicata dall'URL (interpretando 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 "Apri il file (come gps grezzo se .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 "" "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi" -#: ../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 "Seleziona i risultati della ricerca della stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Lancia in modalità massimizzata" -#: ../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 "Reimposta le preferenze predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Imposta la lingua." -#: ../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 "Esempi" -#: ../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" @@ -3488,25 +3835,25 @@ "quindi assicurati di caricare dei dati prima di indicare una selezione." -#: ../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 "Invece di --download= puoi utilizzare 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 "Attivazione estensioni aggiornate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Caricamento vecchie estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Impostazioni predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Caricamento estensioni" -#: ../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." @@ -3515,22 +3862,22 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Strumenti" -#: ../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 "Preimpostati" -#: ../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 @@ -3542,21 +3889,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 "Visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Abilita/disabilita la visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Schermo pieno" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Abilita/disabilita visualizzazione a schermo pieno" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3596,58 +3943,44 @@ msgstr "Riduci" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "scala" -#: ../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 "La longitudine geografica del puntatore del mouse." -#: ../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 "Il nome dell'oggetto sul puntatore del mouse." -#: ../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 "La latitudine geografica del puntatore del mouse." -#: ../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 "L'angolo tra il segmento di percorso corrente e quello precedente." -#: ../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 "Direzione della bussola del segmento che si sta disegnando." -#: ../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 "Lunghezza del segmento di percorso che si sta disegnando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(nessun oggetto)" -#: ../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 "livello non in lista." -#: ../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 "" - -#: ../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 "" @@ -3659,10 +3992,4 @@ msgid "File not found" msgstr "File non trovato" - -#: ../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 @@ -3722,7 +4049,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" @@ -3738,5 +4064,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" @@ -3843,5 +4169,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 "Versione personale" @@ -3854,5 +4180,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" @@ -3868,5 +4194,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 "La loro versione" @@ -3955,6 +4281,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" @@ -4072,10 +4398,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 "indice di colonna non atteso. Ottenuto {0}" -#: ../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 "" @@ -4086,19 +4412,19 @@ "server
Dettagli: {0}" -#: ../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 "Comunicazione con il server fallita" -#: ../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 "Si, ripristina anche questo" -#: ../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 "No, annulla l'operazione" -#: ../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 "" @@ -4109,5 +4435,5 @@ "cancellati sul server.

Vuoi recuperare anche questi nodi?" -#: ../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 "Ripristina i nodi addizionali?" @@ -4125,10 +4451,10 @@ msgstr "Ripristina le primitive dipendenti?" -#: ../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 "" "Proprietà nell'insieme di dati personale, cioè l'insieme di dati locale" -#: ../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 " @@ -4136,95 +4462,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 "Proprietà nel loro insieme di dati, cioè l'insieme di dati del server" -#: ../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 "Coordinate:" -#: ../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 "Stato eliminato:" -#: ../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 "Stato visibile:" -#: ../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 "(nessuno/a)" -#: ../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 "cancellato" -#: ../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 "non eliminato" -#: ../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 "visibile (sul server)" -#: ../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 "non visibile (sul server)" -#: ../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 "Mantieni un clone della versione locale" -#: ../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 "Elimina fisicamente dall'insieme di dati locale" -#: ../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 "Mantieni le mie coordinate" -#: ../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 "Mantieni le loro coordinate" -#: ../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 "Marca come irrisolto il conflitto tra coordinate differenti" -#: ../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 "Mantieni il mio stato eliminato" -#: ../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 "Mantieni il loro stato eliminato" -#: ../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 "Marca come irrisolto il conflitto tra stati eliminati" -#: ../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 "Mantieni il mio stato visibile" -#: ../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 "Si, reimposta l'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 "No, annulla" -#: ../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 "" "Per mantenere la propria versione locale, JOSM
deve reimpostare " @@ -4232,17 +4560,17 @@ "assegnerà ad esso
un nuovo identificativo.
Si è d'accordo?" -#: ../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 "Reimposta l'id a 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 "Mantieni il loro stato visibile" -#: ../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 "Si, elimina" -#: ../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 "" @@ -4253,21 +4581,21 @@ "
dall'insieme di dati.
Si è d'accordo?" -#: ../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 "Elimina dall'insieme di dati" -#: ../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 "Ruolo" #: ../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 "Primitiva" @@ -4310,10 +4638,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 @@ -4322,10 +4651,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 @@ -4339,5 +4669,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}" @@ -4380,4 +4710,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Il loro insieme di dati non include una etichetta con la chiave {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 "nessuno" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "tutti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Scegli un colore" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "il parametro ''{0}'' non deve essere nullo" + +#: ../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 "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''" + +#: ../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 "non eliminato" + +#: ../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 "Non ancora implementato." + +#: ../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 "dal percorso" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Conflitto nei dati" + +#: ../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} percorso" +msgstr[1] "{0} percorsi" + +#: ../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} relazione" +msgstr[1] "{0} relazioni" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Risoluzione conflitto" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Risolvi conflitti" + +#: ../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 "Applica" + +#: ../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 "Incolla" + +#: ../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} percorso" +msgstr[1] "{0} percorsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4394,10 +4861,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 @@ -4405,5 +4872,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}" @@ -4436,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 "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." -#: ../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 "Annulla la risoluzione del conflitto e chiudi la finestra" -#: ../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 "Applica i conflitti risolti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Applica risoluzione" -#: ../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 +msgstr "Chiudi comunque" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Continua risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4477,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 +msgstr "Conflitto non risolto completamente" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Risolvi conflitti" -#: ../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 "Cronologia" -#: ../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 "Visualizza la cronologia di tutti gli oggetti selezionati." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"E'' fallito il caricamento dello storico dal server. Dettagli:
{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 "indice fuori dai limiti Ottenuto {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 "Nodo {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 "Livello: {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 "Relazioni: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Elemento dello storico" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Carica storico" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Caricamento dello storico per {0} con 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 "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista." #. 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 "Visualizza" -#: ../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 "Visualizza lo storico della primitiva selezionata" -#: ../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 "Livelli" -#: ../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 "Apre la lista di tutti i livello caricati." -#: ../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 "Cancella il livello selezionato." -#: ../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 "Elimina livello" - -#: ../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 "" - -#: ../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 "Mostra/Nascondi" -#: ../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 "Inverte la visibilità del livello selezionato." -#: ../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 +msgstr "Attiva" + +#: ../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 +msgstr "Attiva il livello selezionato" + +#: ../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 "Sposta il livello selezionato in su." -#: ../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 "Sposta il layer selezionato in giù." -#: ../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 +msgstr "Informazioni sul livello" + +#: ../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." @@ -4631,28 +5058,22 @@ msgstr[1] "Questo cambierà {0} oggetti." -#: ../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 "Un valore vuoto cancella la chiave." -#: ../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 "Cambiare i valori?" -#: ../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" @@ -4661,89 +5082,84 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti" -#: ../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 "Seleziona una chiave" -#: ../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 "Seleziona un valore" -#: ../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 "Seleziona gli oggetti di cui vuoi cambiare le proprietà." -#: ../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 "Proprietà/Appartenenze" -#: ../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 "Proprietà per gli oggetti selezionati." #. 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 "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../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 "Aggiungi" -#: ../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 "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Modifica proprietà" -#: ../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 "Modifica il valore della chiave selezionata per tutti gli oggetti" -#: ../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 "Proprietà: {0} / Appartenenze: {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 "Proprietà / Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Cambia relazione" -#: ../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 "Vuoi veramente cancellare la selezione dalla relazione {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 "Cancella la chiave selezionata in tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Elimina proprietà" @@ -4752,34 +5168,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 "Relazioni" -#: ../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 "Apri tutte le relazioni in una lista" -#: ../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 "Relazioni: {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 "Apri le relazioni selezionate in un editor" -#: ../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 "Cancella le relazioni selezionate" -#: ../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 "Crea una nuova relazione" -#: ../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 "" @@ -4812,23 +5228,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 "Selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} percorso" -msgstr[1] "{0} percorsi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relazione" -msgstr[1] "{0} relazioni" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4836,14 +5238,9 @@ msgstr "Selezione: {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 "Stacca il pannello" -#: ../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." @@ -4852,15 +5249,15 @@ "degli strumenti a sinistra." -#: ../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 "Cliccare per minimizzare/massimizzare il contenuto del pannello" -#: ../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 "Autori" -#: ../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 "" @@ -4868,50 +5265,85 @@ "selezionati." -#: ../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] "Autore" +msgstr[1] "Autore" + +#: ../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 "Visualizza" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Ulteriori informazioni su questa caratteristica" + +#: ../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 "" +"ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} " +"delle {1} primitive selezionate" + +#: ../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 "Autore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "N. di oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autori: {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 "Scarica i membri della relazione" -#: ../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 "Conflitto nei dati" -#: ../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 "" @@ -4920,47 +5352,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 +msgstr "La relazione è eliminata" + +#: ../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 +msgstr "Scaricamento della relazione {0}" + +#: ../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 +msgstr "Etichette e Membri" + +#: ../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 +msgstr "Ruolo:" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 msgid "" "There is at least one member in this relation referring
to the " @@ -4969,14 +5395,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 +msgstr "Rimuovili, ripulisci la relazione" + +#: ../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 +msgstr "Ignorali, mantieni la relazione com'è" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 #, java-format msgid "" @@ -4986,9 +5412,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 "" @@ -4998,15 +5424,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -5014,5 +5440,5 @@ msgstr "" -#: ../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 " @@ -5020,20 +5446,20 @@ msgstr "" -#: ../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 "" @@ -5042,57 +5468,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 "Sposta in alto i membri attualmente selezionati" #. 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 "Sposta in basso i membri attualmente selezionati" #. 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 +msgstr "No, continua la modifica" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5101,9 +5527,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 +msgstr "Conflitto nei dati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 #, java-format msgid "" @@ -5112,20 +5538,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 "" +msgstr "Applica gli aggiornamenti correnti" #: ../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 +msgstr "Applica gli aggiornamenti e chiudi la finestra" + +#: ../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 @@ -5135,37 +5557,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 +msgstr "Annulla gli aggiornamenti e chiudi la finestra" + +#: ../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 +msgstr "Aggiungi una etichetta vuota" + +#: ../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 +msgstr "elimina le etichette correntemente selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 msgid "Download all incomplete ways and nodes in relation" msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" -#: ../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 "Scarica i membri" -#: ../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 +msgstr "Imposta un ruolo ai membri selezionati" + +#: ../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 +msgstr "Applica Ruolo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356 #, java-format msgid "" @@ -5175,30 +5597,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 +msgstr "Si, applica" + +#: ../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 +msgstr "No, non applicare" + +#: ../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 +msgstr "Conferma ruolo vuoto" + +#: ../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 +msgstr "Zoom a" + +#: ../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 "" @@ -5206,28 +5628,33 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 msgid "Refers to" -msgstr "" +msgstr "Fa riferimento a" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 msgid "Linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgstr "Collegato" + +#: ../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 +msgstr "Scarica le relazioni collegate" + +#: ../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 "Carica relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5254,5 +5681,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 msgid "Load relation" -msgstr "" +msgstr "Carica relazione" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 @@ -5260,34 +5687,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] "Rimuovi le vecchie chiavi da {0} oggetto" -msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Segnalibri" -#: ../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 "Per prima cosa inserisci le coordinate della località." -#: ../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 "Inserisci il nome della località." -#: ../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 "Per prima cosa, scegli un segnalibro." @@ -5345,13 +5759,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 "Eccezione del puntatore nullo, è probabile che manchino alcuni tag." -#: ../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 "Inserire la stringa da cercare" -#: ../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 "Impossibile leggere dal server i risultati della ricerca del luogo" @@ -5359,18 +5773,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 "Inserire il nome di un luogo da cercare:" -#. 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 "Luoghi" #. 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 "nome" @@ -5409,37 +5822,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 "tipo" -#: ../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 "vicino a" -#: ../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 "livello di ingrandimento" -#: ../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: " @@ -5448,5 +5861,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 "Slippy map" @@ -5473,35 +5886,44 @@ msgstr "Numeri dei tasselli" -#: ../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 "Storico per {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 "Storico per {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Storico per {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Chiudi la finestra" -#: ../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 "Visualizza lo storico della primitiva selezionata" + +#: ../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 "" @@ -5509,13 +5931,32 @@ "primitiva corrente." -#: ../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 "Nodo {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Carica storico" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Caricamento dello storico per {0} con id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Caricamento dello storico per {0} con id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Caricamento dello storico per {0} con id {1}" #. item "Streets/Motorway" text "Reference" @@ -5833,14 +6274,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6016,8 +6471,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" #. @@ -6114,4 +6575,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6225,6 +6689,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 @@ -6232,156 +6696,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 "Nome" -#: ../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 "" "Versione {0} creata il {1} da " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "gruppo di modifiche" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Ulteriori informazioni su questa caratteristica" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Ultima modifica {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6389,32 +6871,287 @@ msgstr "Versione {0} creata il {1} da {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Versione" -#: ../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 "Nome Strada" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Si" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "No" + +#: ../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 "Seleziona un valore" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "il parametro ''{0}'' non deve essere nullo" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Correggi i conflitti di etichette" + +#: ../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] "" + +#: ../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] "" + +#: ../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 "Annulla ed Esci" + +#: ../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 "Salva ed Esci" + +#: ../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 "Layer" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Al caricamento" + +#: ../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 "File" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Invio in corso" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Immagini per {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 "Leggi 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 "Informazioni di tempo non disponibili per il punto {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 "Impossibile leggere il tempo \"{0}\" per il punto {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 "Non è stata trovata nessuna immagine con una data leggibile." -#: ../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 @@ -6422,29 +7159,29 @@ msgstr "Lettura di {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 "Immagini geoetichettate" -#: ../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 inizio: {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 fine: {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 "differenza attuale: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "differenza fuso orario: " -#: ../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" @@ -6453,14 +7190,14 @@ msgstr[1] "immagini" -#: ../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} in questa traccia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sincronizza tempo" -#: ../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 @@ -6468,82 +7205,82 @@ msgstr "Immagini JPEG (*.jpeg)" -#: ../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 "Impossibile leggere la data nel file \"{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 "Orario non presente nei dati EXIF del file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Immagine" -#: ../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 "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" -#: ../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 "Fuso orario del GPS (differenza rispetto alle foto)" -#: ../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 "Sincronizza l'orario con l'unità 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 "Impossibile decodificare l'orario inserito." -#: ../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 "punto 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 "Personalizza disegno linee" +#: ../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 "Usa le impostazioni globali." + #: ../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 "Usa le impostazioni globali." +msgid "Draw lines between points for this layer." +msgstr "Disegna le linee tra i punti di questo livello." #: ../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 "Disegna le linee tra i punti di questo livello." - -#: ../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 "Non disegnare le linee tra i punti di questo livello." -#: ../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 "Seleziona le opzioni per il disegno delle linee" -#: ../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 "Personalizza colori" -#: ../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 "Predefinito" -#: ../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" @@ -6603,5 +7340,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}" @@ -6617,10 +7354,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 "Converti in livello dati" #: ../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." @@ -6631,11 +7368,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 @@ -6677,4 +7414,9 @@ "vuole procedere?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Scaricamento dei dati" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6698,19 +7440,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../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 "Livello dati {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 "al di fuori dell'area scaricata" -#: ../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 "versione {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 "" @@ -6718,46 +7460,46 @@ "nella versione 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} è composto da:" -#: ../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} eliminati)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "disattiva" -#: ../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 "Versione delle 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 "Converti in un layer 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" @@ -6765,5 +7507,5 @@ msgstr[1] "tracce" -#: ../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" @@ -6771,5 +7513,5 @@ msgstr[1] "punti" -#: ../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 +7520,5 @@ msgstr[1] "una traccia con {0} punti" -#: ../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" @@ -6785,5 +7527,5 @@ msgstr[1] "{0} è composto da {1} tracce" -#: ../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" @@ -6792,9 +7534,9 @@ msgstr[1] "{0} punti" -#: ../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 "segnaposto 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" @@ -6802,5 +7544,5 @@ msgstr[1] "marcatori" -#: ../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" @@ -6819,5 +7561,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}." @@ -6825,5 +7567,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 "Impossibile sincronizzare nel layer in esecuzione." @@ -6851,5 +7593,5 @@ msgstr "Invertire la visualizzazione dei marcatori di testo ed icone" -#: ../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 " @@ -6860,5 +7602,5 @@ "(dopo il primo marcatore)." -#: ../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 " @@ -6868,29 +7610,29 @@ "tracciato da sincronizzare." -#: ../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 "Impossibile creare un nuovo segnaposto Audio" -#: ../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 "Impossibile mostrare l'URL per questo marcatore" -#: ../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 "(URL: " -#: ../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 "Impossibile visualizzare l'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 "Preferenze avanzate" -#: ../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 "Impostazione diretta delle preferenze. Usare con cautela!" -#: ../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 @@ -6898,27 +7640,27 @@ msgstr "Cerca: " -#: ../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 "Il valore corrente è quello di default." -#: ../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 "Il valore di default è ''{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 "" "Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)." -#: ../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 "Scegli la riga da modificare." -#: ../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 @@ -6926,14 +7668,14 @@ msgstr "Nuovo valore per {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 "Scegli la riga da cancellare." -#: ../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 "Inserisci una nuova coppia chiave/valore" @@ -7079,40 +7821,40 @@ msgstr "Calibrazione del registratore vocale" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Colore" -#: ../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 "Stile di disegno {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 "Livello: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Scegliere" -#: ../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 "Scegliere un colore per {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 "Reimposta predefinito" -#: ../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 "Reimposta tutto predefinito" -#: ../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 "Colori usati da diversi oggetti in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Colori" @@ -7157,5 +7899,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Automobile" @@ -7177,16 +7919,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 "Bicicletta" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7216,12 +7959,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 "Pedone" @@ -7415,5 +8158,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 "Mostra la finestra d'avvio" @@ -7421,23 +8164,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 "Mostra l'ID dell'oggetto nelle liste di selezione" #: ../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 "Mostra l'ID dell'oggetto nelle liste di selezione" + +#: ../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 "Disegna la linea d''aiuto ad elastico" -#: ../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 "Lavoro senza modalità di editing (Stile 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 "Mostra l'ID dell'oggetto nelle liste di selezione" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Non richiedere di cambiare modo di lavoro (stile di lavoro 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 "Aspetto e stile" @@ -7469,54 +8223,54 @@ msgstr "Stile usato" -#: ../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 "Configura le estensioni disponibili." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Scarica la lista" -#: ../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 "Aggiorna" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Configura i siti..." -#: ../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 "Aggiungi indirizzo URL di descrizione dell'estensione 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 +msgstr "Inserire l'indirizzo URL" + +#: ../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 "Seleziona una voce." -#: ../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 "Modifica indirizzo URL di descrizione dell'estensione 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 "Configura i siti delle estensioni" #. 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 "Impostazioni di visualizzazione" -#: ../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 " @@ -7526,43 +8280,43 @@ "programma." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Impostazioni di connessione" -#: ../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 "Impostazioni di connessione al server 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 "Impostazioni della mappa" -#: ../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 "" "Impostazioni per la proiezione della mappa e l'interpretazione dei dati." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Impostazione dell'audio" -#: ../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 "Impostazioni del riproduttore audio e del marcatore audio." -#: ../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 "" "È necessario riavviare JOSM perché alcune impostazioni abbiano effetto." -#: ../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 "Visualizza le coordinate come" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Metodo di proiezione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Proiezione della mappa" @@ -7595,12 +8349,4 @@ msgid "Proxy server password" msgstr "Password del server proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "L'URL di base per il server OSM (API REST)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL di base per il server" #. 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 @@ -7627,47 +8373,46 @@ msgstr "Scorciatoia" -#: ../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 "Breve descrizione: {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 "Indirizzo 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 "Autore: {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 "Pagina internet: {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 "Versione: {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 "Percorso Icone" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Copia predefiniti" -#: ../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 "Selezionare la riga da copiare." -#: ../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." @@ -7676,14 +8421,14 @@ "{0}." -#: ../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 "Aggiungi una nuova sorgente XML alla lista." -#: ../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 "Elimina la sorgente selezionata nella lista." -#: ../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 "Predefiniti (vedere il suggerimento per informazioni dettagliate)" @@ -7877,36 +8622,59 @@ msgstr "Gruppi dei modificatori" -#: ../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] "Rimuovi le vecchie chiavi da {0} oggetto" +msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Aggiungi un nuovo livello" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Cancella il livello selezionato." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Ulteriori informazioni su questa caratteristica" #. 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 "Attributi opzionali:" -#: ../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 "Usa la preimpostazione \"{0}\" del gruppo \"{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 "Usa la preimpostazione ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "percorso chiuso" -#: ../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 "Tipo sconosciuto: {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 @@ -7914,15 +8682,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {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 "Impossibile leggere {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 "Sono supportati elementi di tipo {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 @@ -7932,22 +8700,22 @@ msgstr[1] "Modifica {0} oggetti" -#: ../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 "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Modifica Proprietà" -#: ../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}''" @@ -7986,11 +8754,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 "Impossibile leggere \"{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 " @@ -8000,38 +8768,38 @@ "con licenza 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 "Files GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "descrizione della traccia GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Aggiungi informazioni sull'autore" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nome reale" -#: ../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 "Diritto d'autore (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Predefinito" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Copyright anno" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Parole chiave" @@ -8041,9 +8809,9 @@ msgstr "Opzioni di esportazione" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Esporta e Salva" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8054,10 +8822,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 "Scegliere una licenza predefinita" -#: ../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 @@ -8067,12 +8835,12 @@ msgstr "Marcatori da {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 "il file \"{0}\" non esiste" -#: ../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" @@ -8094,6 +8862,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 @@ -8103,10 +8871,20 @@ msgstr "Scaricamento dei dati OSM in corso..." -#: ../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 "Modifica la relazione #{0} nel layer ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8114,10 +8892,20 @@ "Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato." -#: ../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 "Nulla è stato aggiunto alla selezione cercando ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8127,34 +8915,34 @@ "singola primitiva" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Files 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 "Coordinate importate: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Formato non corretto: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Errori di checksum: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Frase sconosciuta " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Coordinate iniziali " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA importato con successo" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Importazione NMEA non riuscita!" @@ -8165,9 +8953,9 @@ msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare 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 "Questa versione di JOSM non è compatibile con il configurato." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8178,5 +8966,5 @@ "supportare le versione da {0} a {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}" @@ -8185,10 +8973,10 @@ "protocollo" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8196,34 +8984,92 @@ msgstr "" -#: ../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 "Apertura del gruppo di modifiche..." -#: ../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 "Apertura del gruppo di modifiche..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Apertura del gruppo di modifiche..." + +#: ../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 "Apertura del gruppo di modifiche..." + +#: ../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 "Chiusura del gruppo di modifiche..." -#: ../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 "Chiusura del gruppo di modifiche..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Apertura del gruppo di modifiche..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Invio in corso..." -#: ../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 +msgstr "Attesa di 10 secondi ... " + +#: ../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 +msgstr "OK - nuovo tentativo." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 #, java-format msgid "Starting retry {0} of {1}." @@ -8251,29 +9097,33 @@ msgstr "File bz2 non valido." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Nome utente o password errati." -#: ../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 "Attenzione: la password è trasferita non cifrata." -#: ../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 "Salva nome utente e password (non cifrata)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Inserire la password" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Login" -#: ../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 "L'URL di base per il server OSM (API REST)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Nome di accesso (e-mail) al profilo 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." @@ -8282,13 +9132,17 @@ "password." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL di base per il server" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "Nome utente 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 "Password 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." @@ -8300,20 +9154,20 @@ "all'interno dell'URL.
Non usare una password di valore." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Server dei File di OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8322,5 +9176,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8501,9 +9355,9 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 msgid "Downloading referring ways ..." -msgstr "" +msgstr "scaricamento dei percorsi collegati ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 msgid "Downloading referring relations ..." -msgstr "" +msgstr "Scaricamento delle relazioni collegate ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -8532,35 +9386,46 @@ "internet." -#: ../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} rimanenti. Caricamento di {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} rimanenti. Caricamento di {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} rimanenti. Caricamento di {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 "Niente da caricare. Prima è necessario ottenere dei dati." + +#: ../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 "Aggiorna estensioni" -#: ../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 "Scarica Estensioni" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8573,5 +9438,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." @@ -8581,23 +9446,23 @@ "Le estensioni {0} sono state scaricate con successo. Riavviare 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 "Scaricamento estensione {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Salta il download" -#: ../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 "Per l''estensione {1} è richiesta la versione di JOSM {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Scarica estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Salta scaricamento" @@ -8608,5 +9473,5 @@ msgstr "E' stato generato un errore dall'estensione {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." @@ -8615,20 +9480,20 @@ "non è più necessaria." -#: ../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 "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM." -#: ../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 "Il plugin {0} è richiesto dal plugin {1} ma non è stato trovato" -#: ../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 "Estensione non trovata: {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." @@ -8637,5 +9502,5 @@ "giorni fa." -#: ../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 " @@ -8646,21 +9511,21 @@ "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 "Disabilita estensione" -#: ../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 "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Mantieni estensione" -#: ../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 " @@ -8670,5 +9535,5 @@ "i permessi per sovrascrivere quelle esistenti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8678,10 +9543,10 @@ "dall'estensione ''{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 "Secondo le informazioni all'interno del plugin l'autore è {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." @@ -8690,9 +9555,9 @@ "comunicare un bug." -#: ../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 "Disabilitare l'estensione?" -#: ../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 " @@ -8702,14 +9567,14 @@ "eliminare l'estensione." -#: ../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 "" "L''estensione non può essere rimossa. Probabilmente è stata già disabilitata" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "Informazioni sull''estensione" -#: ../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" @@ -8720,5 +9585,5 @@ msgstr "Maggiori dettagli" -#: ../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" @@ -8727,18 +9592,18 @@ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Non è stata trovata alcuna informazione sulle estensioni." -#: ../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 "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato." -#: ../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 "Tutte le estensioni sono state aggiornate." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8751,9 +9616,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 "Scarica le estensioni mancanti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8766,35 +9631,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}: Versione {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 "Estensioni fornite con 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 "Impossibile leggere il file con le informazioni sulle estensioni: {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 "Questo si trova dopo la fine della registrazione" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Impossibile riprodurre il suono" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Non fare niente" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Segnala bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8809,14 +9674,14 @@ "inoltrare un bug report." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Eccezione inattesa" -#: ../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 "Si prega di segnalare il problema a {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 "" @@ -8824,5 +9689,5 @@ "possibile)!" -#: ../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 " @@ -8832,13 +9697,13 @@ "di segnalare un problema." -#: ../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 "Assicurarsi di includere le seguenti informazioni:" -#: ../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 "(Il testo è stato già copiato nei tuoi appunti)" -#: ../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}." @@ -8847,6 +9712,6 @@ "{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 "" @@ -8857,5 +9722,5 @@ "ragioni di sicurezza. L''eccezione è stata: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8866,5 +9731,5 @@ "serio problema di configurazione. JOSM terminerà di funzionare." -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8878,5 +9743,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" @@ -8886,5 +9751,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8895,21 +9760,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 "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)" -#: ../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 "" @@ -8938,9 +9838,27 @@ msgstr "Crea una griglia di percorsi" -#: ../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 "Carica tracciato" -#: ../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 @@ -8948,28 +9866,40 @@ msgstr "Carica tracciati" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Pubblico" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "" -"Se selezionato rende pubblico il proprio tracciato in 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 "Descrizione" -#: ../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 "Inserire la descrizione sul proprio tracciato." -#: ../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 "Inserire le etichette sul proprio tracciato." -#: ../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}" @@ -8977,47 +9907,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 "Connessione in corso..." -#: ../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 "Caricamento annullato" -#: ../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 "Errore durante il caricamento" -#: ../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 "Caricamento GPX completato con successo" -#: ../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 "Caricamento fallito. Il server ha risposto con il seguente messaggio: " -#: ../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 "Caricamento tracciato GPX in corso: {0}% ({1} di {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 "Non è stata fornita alcuna descrizione. Specificarne una." -#: ../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 "Nessun livello GPX selezionato. Impossibile caricare un tracciato." -#: ../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 "Non è stato fornito alcun nome utente." -#: ../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 "Non è stata fornita alcuna password." -#: ../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 "Caricamento del tracciato GPX in corso" @@ -9130,19 +10060,19 @@ msgstr "Carica le immagini come un nuovo layer." -#: ../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 "File 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 "Il file {0} è stato caricato già sotto il nome \"{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 "Impossibile interpretare {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." @@ -9153,34 +10083,34 @@ "la foto.
Copia l'ora dalla foto e seleziona la fascia oraria
" -#: ../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 "Ora di scatto della fotografia (dai dati 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 "Ora GPS (letto dalla fotografia precedente): " -#: ../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 " [gg/mm/aaaa hh:mm:ss]" -#: ../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 "Mi trovo nel fuso orario di: " -#: ../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 "Nessuna data" -#: ../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 "Apri un'altra fotografia" -#: ../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 "Sincronizza l'ora da una fotografia del ricevitore 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" @@ -9190,29 +10120,29 @@ "Si prega di usare il formato richiesto" -#: ../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 "Data non valida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 "Tracciato 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 "Apri un altro tracciato 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 "Fuso orario: " -#: ../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 "Scostamento:" -#: ../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 "" @@ -9220,41 +10150,41 @@ "di aiuto?" -#: ../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 "Aggiorna la posizione per: " -#: ../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 "Tutte le immagini" -#: ../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 "Immagini senza posizione 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 "Immagini ancora senza etichetta" -#: ../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 "Correla le immagini al tracciato 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 "Correla" -#: ../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 "Auto-determina" -#: ../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 "Selezionare un tracciato 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 "Nessun tracciato GPX selezionato" -#: ../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 "" @@ -9265,9 +10195,9 @@ "Formato atteso: {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 "Fuso orario non valido" -#: ../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 "" @@ -9278,26 +10208,26 @@ "Formato atteso: {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 "Compensazione non valida" -#: ../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 "Trovate {0} corrispondenze {1} nel tracciato 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 "Tracciato GPS caricato" -#: ../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 "Le foto selezionate non contengono informazioni sull'ora." -#: ../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 "Le foto non contengono informazioni sull'ora" -#: ../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." @@ -9306,39 +10236,39 @@ "Selezionarne un altro." -#: ../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 "Il tracciato GPX non contiene alcuna informazione sull'ora" -#: ../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 "Fuso orario: {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 "Minuti: {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 "Secondi: {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 "Correlate {0} su {1} foto al tracciato 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 "(Differenza di orario pari a {0} giorni)" -#: ../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 "Differenza tra il tracciato e le foto: {0}m {1}s" -#: ../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 " @@ -9349,13 +10279,13 @@ "manualmente le foto." -#: ../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 "E' fallita la correlazione delle foto al tracciato" -#: ../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 "Regola fuso orario e differenza" -#: ../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 "Valori predefiniti" @@ -9376,5 +10306,5 @@ msgstr "Errore nel file {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9387,12 +10317,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 "Seleziona tutto" - -#: ../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 "Errore durante il caricamento del file" @@ -9421,8 +10350,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 "" "La località {0} non è stata trovata nel WMS.\n" @@ -9433,21 +10362,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 "Seleziona il comune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Scegliere da..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Sorgente auto-determinata" -#: ../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" @@ -9460,37 +10389,48 @@ "Si desidera ripristinare F11 per l'azione di cattura ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Ripristino della scorciatoia F11 di cattura" -#: ../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 "JOSM si è fermato in attesa che il cambiamento abbia effetto." -#: ../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 "Sostituisci lo sfondo originale con il colore di sfondo 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 "Inverti i colori grigi (per sfondi neri)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Imposta lo sfondo trasparente." -#: ../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 "Traccia i contorni dei dati scaricati." -#: ../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 "Abilita la cache automatica." -#: ../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 "Massima dimensione della cache (in MB)" -#: ../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." @@ -9508,9 +10448,9 @@ "caricamento di dati creati da questa estensione." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS francese del catasto" -#: ../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 "" @@ -9518,10 +10458,10 @@ "automatica" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Sorgente" -#: ../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 " @@ -9531,5 +10471,5 @@ "preferenze di 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). " @@ -9539,9 +10479,9 @@ "intermedi). Utile per testi su sfondi scuri." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Permette la sovrapposizione di livelli multipli" -#: ../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 "" @@ -9549,34 +10489,32 @@ "trasparente." -#: ../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 "Traccia un rettangolo attorno i dati scaricati dal server 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 "Moltiplicatore di attrazione dell'immagine:" - -#: ../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 "" "Ottieni immagini più piccole (maggiore qualità ma più utilizzo di memoria)" -#: ../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 "Dimensioni fisse riquadro (predefinito è 100m)" -#: ../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 "Dimensioni fisse (da 25 a 1000 metri)" -#: ../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 "Moltiplicatore di attrazione dell'immagine:" - -#: ../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 "" @@ -9636,12 +10574,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Collegamento al Server WMS in corso..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "immagine non caricata" +msgstr "Immagine già caricata" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9675,20 +10611,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" @@ -9696,9 +10632,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 "caricamento immagine..." + +#: ../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" @@ -9706,31 +10648,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 "Est" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 +msgid "North" +msgstr "Nord" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Enter cadastre east,north position" -msgstr "Inserire Lat/Lon a cui andare." - -#: ../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 "est" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "nord" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Mantieni le loro coordinate" +msgid "Set " +msgstr "Seleziona" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9793,8 +10743,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25 msgid "Export as PNG format (only raster images)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +msgstr "Esporta in formato PNG (solo immagini raster)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9818,6 +10768,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 "Livello vuoto" @@ -9833,7 +10783,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Centro del easter: {0}" +msgstr "Dimensioni raster: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10363,6 +11313,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 "acqua" @@ -10375,8 +11325,4 @@ msgid "land" msgstr "terraferma" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "nessuno" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10551,5 +11497,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsData.java:130 msgid "no name" -msgstr "" +msgstr "senza nome" #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45 @@ -10678,9 +11624,9 @@ msgstr "Ciclo di scaricamento di 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 "Visualizza segnalazioni 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 " @@ -10692,5 +11638,5 @@ "migrare al nuovo server? (Fortemente consigliato)" -#: ../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 "Migrare sul nuovo server openstreetbugs?" @@ -11274,5 +12220,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 "Nome Strada" @@ -11291,29 +12237,29 @@ msgstr "Visualizza il pannello degli autori" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Apri la pagina dell'utente" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Apri la pagina dell'utente nel browser" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Seleziona i dati dell'utente" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Sostituisci la selezione con i dati dell'utente" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Selezionare alcuni dati" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Scegliere un utente mediante il pannello degli autori" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Spiacente, ma non funziona con gli utenti anonimi" @@ -11327,24 +12273,15 @@ msgstr "Unisci aree che si sovrappongono l'un l'altra" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di caricarlo." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Continua comunque" - -#: ../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 "Attualmente solo due aree possono essere unite." -#: ../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}\" non è chiuso e quindi non può essere unito." -#: ../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" @@ -11357,14 +12294,14 @@ "Sei veramente sicuro di continuare ?" -#: ../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 "Si prega di annullare se non si è sicuri" -#: ../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 "Seleziona almeno un percorso chiuso che dovrebbe essere unito." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "" @@ -11372,25 +12309,25 @@ "modifica." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Nodo aggiunto su tutte le intersezioni" -#: ../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 "Elimina i percorsi che non fanno parte di un multi-poligono interno" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Correggi le relazioni" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "L'area auto-sovrapposta è stata unita" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Le aree sovrapposte sono state unite" -#: ../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 " @@ -11400,33 +12337,33 @@ "favore verifica che non siano stati introdotti errori." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Correggi i conflitti di etichette" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Sono stati rimossi elementi dalle Relazioni" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Unisi Aree: Elimina le way corte" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Strada chiusa (anello)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Rimuovi i tag dalle way interne" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funzione di unione delle Aree" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Vai alla posizione" -#: ../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 "" @@ -11434,29 +12371,29 @@ "specifico." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Inserire Lat/Lon a cui andare." -#: ../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 "Puoi anche incollare un URL da www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (in metri)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 msgid "URL" msgstr "Indirizzo URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 msgid "Jump there" msgstr "Salta lì" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Salta alla posizione" -#: ../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 "" @@ -11464,21 +12401,21 @@ "Verifica." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Impossibile interpretare longitudine/latitudine" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Semplifica percorso" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Elimina i nodi non necessari dal percorso." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Selezionare almeno un percorso da semplificare." -#: ../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?" @@ -11490,25 +12427,25 @@ "La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare tutti?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Sei sicuro?" -#: ../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 "Errori di verifica" -#: ../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 "Nessun errore individuato" -#: ../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 "Griglia" -#: ../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 "" @@ -11602,53 +12539,53 @@ msgstr "Esegue la convalida dei dati" -#: ../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 "I dati contengono errori. Caricarli ugualmente?" -#: ../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 "Apre la finestra di verifica." -#: ../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 "Porta lo zoom sul problema" -#: ../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 "Correggi" -#: ../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 "Correggi gli errori selezionati." -#: ../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 "Ignora" -#: ../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 "La prossima volta ignora gli errori selezionati" -#: ../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 "Tutto il gruppo" -#: ../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 "Elementi singoli" -#: ../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 "Niente" -#: ../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 "Ignorare tutto il gruppo o i singoli elementi?" -#: ../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 "Ignora elementi" -#: ../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" @@ -11672,23 +12609,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 "" "Questo test controlla se due strade, ferrovie o corsi d'acqua si incrociano " "sullo stesso livello senza essere connessi a vicenda tramite un nodo." -#: ../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 "Crea un edificio" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Percorsi incrociati" -#: ../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 "Nodi duplicati" -#: ../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 "Questo test verifica che non ci siano due nodi nella stessa posizione." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Nodi con lo stesso nome" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Conferma" + +#: ../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 "Duplica percorso" + +#: ../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 "Questo test verifica che non ci siano due nodi nella stessa posizione." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Crea un percorso duplicato" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11779,9 +12749,9 @@ "errori d'ortografia." -#: ../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 "Analizzatore delle proprietà :" -#: ../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 "" @@ -11789,15 +12759,15 @@ "proprietà." -#: ../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 "Linea TagChecker non valida - {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 "Linea di correzione ortografica non valida: {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 "" @@ -11808,7 +12778,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 "Combinazione illegale etichetta/valore" @@ -11816,60 +12786,60 @@ #. 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 "Problema di disegno" -#: ../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 "Chiave ''{0}'' non valida." -#: ../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 "Tag con valori vuoti" -#: ../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 "chiave della proprietà non valida" -#: ../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 "spazio non valido nella chiave della proprietà" -#: ../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 "Il valore della proprietà inizia o finisce con uno spazio" -#: ../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 "Il valore della proprietà contiene una entità 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 "Chiave ''{0}'' non presente nei preimpostati." -#: ../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 "I preimpostati non contengono la chiave della proprietà" -#: ../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 "Valore ''{0}'' per la chiave ''{1}'' non presente nei preimpostati." -#: ../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 "I preimpostati non contengono il valore della proprietà" -#: ../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 "FIXME" -#: ../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 "Verifica le chiavi delle proprietà." -#: ../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 "" @@ -11877,22 +12847,22 @@ "valide." -#: ../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 "Usa un analizzatore delle proprietà complesso." -#: ../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 "" "Valida i valori delle proprietà e delle etichette usando regole complesse." +#: ../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 "Sorgente 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." @@ -11903,21 +12873,21 @@ "delle etichette." -#: ../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 "Aggiungi una nuova sorgente alla lista." -#: ../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 "Modifica la sorgente selezionata." -#: ../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 "Sorgenti dei dati" -#: ../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 "Verifica i valori delle proprietà." -#: ../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 "" @@ -11925,9 +12895,9 @@ "validi." -#: ../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 "Cerca FIXME." -#: ../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 "" @@ -11935,54 +12905,54 @@ "proprietà." -#: ../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 "Controllare le note di disegno." -#: ../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 "Controllare se il disegno della mappa contiene degli errori." -#: ../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 "Usa file dati predefinito." -#: ../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 "Usa il file dati predefinito (consigliato)." +#: ../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 "Usa file di controllo ortografico predefinito." -#: ../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 "Usa il file di controllo ortografico predefinito (consigliato)." -#: ../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 "Correggi proprietà" -#: ../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 "Impossibile trovare il tipo di elemento" -#: ../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 "Impossibile trovare il livello di avvertimento" -#: ../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 "Espressione illegale \"{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}''" @@ -12127,7 +13097,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 "building" @@ -12141,5 +13111,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 "area" @@ -12286,5 +13256,5 @@ msgstr "E' stato raggiunto un incrocio" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "E' stata generata una eccezione" @@ -12352,14 +13322,14 @@ msgstr "Aiuto sull'estensione 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 "Immagine rettificata..." -#: ../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 "Scarica immagini rettificate da vari servizi" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12370,26 +13340,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 "Collegamento WMS personalizzato" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Servizi di rettifica supportati:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Visita la homepage" -#: ../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 "Indirizzo URL WMS o ID dell'immagine:" -#: ../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 "Aggiungi immagine rettificata" -#: ../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 " @@ -12399,37 +13369,55 @@ "l'identificativo al servizio selezionato. Si prega di riprovare." -#: ../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 "Nessun id o indirizzo URL WMS valido" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Regola 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 "Correggere la posizione del layer WMS selezionato" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +msgstr "Regola la posizione del livello WMS selezionato" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +msgstr "Selezionare il livello WMS da regolare." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +msgstr "Seleziona il livello WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" -msgstr "" +msgstr "Inizia la regolazione" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgid "There are currently no WMS layer to adjust." +msgstr "Non c'è al momento alcun livello WMS da regolare." #: ../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 +msgstr "Nessun livello da regolare" + +#: ../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 "" @@ -12444,5 +13432,15 @@ msgstr "Scaricamento automatico" -#: ../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 "Attiva" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" @@ -12450,10 +13448,28 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {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 "Livello WMS ({0}), scaricamento per il livello di ingrandimento {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 "Data non valida" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12462,90 +13478,102 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Ricarica tile sbagliati" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Carica livello 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}" msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../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 "Apri un livello WMS vuoto per caricare i dati da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Preferenze dell'estensione 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 "Modifica la lista dei server WMS mostrata nel menù dell'estensione 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 "Nome del Menu" -#: ../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 "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Nome del menu (predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "URL WMS (Predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Inserire un nome per il menù e un URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Copia predefinito" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Copia predefiniti" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Selezionare almeno un precorso." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Downloader:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "File TCX (*.tcx)" #. * @@ -12970,62 +13998,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 "Riferimento" - -#. 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 "Layer" #. item "Streets/Motorway" combo "Layer" @@ -13040,5 +14013,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 "Corsie" @@ -13053,5 +14026,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" @@ -13061,10 +14033,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 "Velocità massima (km/h)" @@ -13108,9 +14080,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 "Senso unico" @@ -13158,13 +14130,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 "Ponte" @@ -13206,13 +14178,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 "Galleria/tunnel" @@ -13252,12 +14224,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 "Sbancamento" @@ -13297,12 +14269,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 "Terrapieno" @@ -13458,17 +14430,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 "Larghezza (metri)" @@ -13495,4 +14467,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" @@ -13511,11 +14484,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 "Superficie" @@ -13525,4 +14499,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" @@ -13537,9 +14512,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 "pavimentata" @@ -13547,10 +14523,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 "non pavimentata" + +#: 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 "Casetta (chalet)" + +#: 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 "calcestruzzo" + +#: 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 "Noleggio" + +#. 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 "bosco" + +#: 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 "Biglietti per il parcheggio" #. item "Ways/Track Grade 2" combo "Surface" @@ -13558,12 +14597,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 "ciottoli (pavé)" + +#: 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 "ghiaia" + +#: 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 "ciottoli (pavé)" + +#: 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 "incompleto" + +#: 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 "erba" + +#: 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 "erba" + +#: 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 "sabbia" + +#. 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 "terra" #. item "Streets/Residential" text "Width (meters)" @@ -13644,20 +14765,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Restrizioni e divieti" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Modifica restrizioni e divieti" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Pedaggio" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Senza uscita (cul-de-sac)" @@ -13670,8 +14791,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 "Permesso di accesso" @@ -13706,32 +14827,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 "si" @@ -13744,40 +14880,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 "privato" -#: 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 "specifico" @@ -13790,19 +14926,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 "destinazione" @@ -13825,65 +14961,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 "permesso" -#: 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 "Agricolo" -#: 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 "no" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Carico e scarico merci" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Merci pesanti/Trasporti eccezionali" @@ -13898,10 +15039,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 "Cavallo" @@ -13917,17 +15058,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 "Motocicletta" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13939,30 +15079,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 "Automobile" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Veicolo di servizio pubblico (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Barca a motore" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Barca" #. 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 "Velocità minima (km/h)" @@ -13970,25 +15110,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 "Peso massimo (tonnellate)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Altezza massima (metri)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Larghezza massima (metri)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Lunghezza massima (metri)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rotatoria" @@ -13999,5 +15139,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 "Modifica un incrocio" @@ -14013,5 +15153,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" #. @@ -14019,9 +15159,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 "Tipo" @@ -14041,10 +15181,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 "motorway" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorway_link" @@ -14066,10 +15206,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 "trunk" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "trunk_link" @@ -14091,10 +15231,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 "primary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "primary_link" @@ -14116,5 +15256,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" @@ -14129,9 +15269,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "tertiary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "unclassified" @@ -14145,9 +15285,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "residential" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "living_street" @@ -14177,10 +15317,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 "service" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "autobus_guidato" @@ -14210,6 +15350,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 "construction" @@ -14220,10 +15360,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 "Modifica ponte" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Modifica un Tunnel" @@ -14231,19 +15371,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Percorsi" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Construction" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Modifica una strada in costruzione" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Svincolo" @@ -14259,5 +15399,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rotatoria" @@ -14266,5 +15406,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Percorso per equitazione" @@ -14272,5 +15412,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Modifica un percorso per equitazione" @@ -14278,5 +15418,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Cycleway" @@ -14286,11 +15426,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 "Modifica Cycleway" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Pedestrian" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Footway" @@ -14299,11 +15445,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Modifica Footway" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Spunzoni" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Pedestrian" @@ -14312,5 +15464,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Modifica Pedestrian" @@ -14318,5 +15470,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Rampa di scale" @@ -14326,5 +15478,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 "Modifica una rampa di scale" @@ -14333,5 +15485,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Track" @@ -14340,39 +15492,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Modifica Track" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "calcestruzzo" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "ghiaia" - -#. 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 "terra" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "erba" - -#: 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 "sabbia" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Track Grade 1" @@ -14381,5 +15505,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Modifica Track Grade 1" @@ -14387,5 +15511,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Track Grade 2" @@ -14394,5 +15518,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Modifica Track Grade 2" @@ -14400,5 +15524,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Track Grade 3" @@ -14407,5 +15531,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Modifica Track Grade 3" @@ -14413,5 +15537,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Track Grade 4" @@ -14420,5 +15544,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Modifica Track Grade 4" @@ -14426,5 +15550,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Track Grade 5" @@ -14433,5 +15557,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Modifica Track Grade 5" @@ -14440,5 +15564,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Percorso" @@ -14447,19 +15571,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Modifica percorso" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Sci" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Motoslitta" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Sci" - #. 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 "Percorso escursionistico" @@ -14469,5 +15596,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 "Modifica percorso escursionistico" @@ -14475,5 +15602,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Percorso escursionistico montano" @@ -14483,5 +15610,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 "Modifica percorso escursionistico montano" @@ -14489,5 +15616,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Percorso escursionistico montano difficile" @@ -14497,5 +15624,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 "Modifica percorso escursionistico montano difficile" @@ -14503,5 +15630,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Percorso escursionistico alpino" @@ -14511,5 +15638,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 "Modifica percorso escursionistico alpino" @@ -14517,5 +15644,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Percorso escursionistico alpino difficile" @@ -14525,5 +15652,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 "Modifica percorso escursionistico alpino difficile" @@ -14531,5 +15658,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Percorso escursionistico alpino molto difficile" @@ -14539,5 +15666,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 "Modifica un percorso escursionistico alpino molto difficile" @@ -14545,10 +15672,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Punti del percorso" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Motorway Junction" @@ -14556,15 +15683,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Modifica Motorway Junction" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Numero" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Services" @@ -14572,5 +15699,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Modifica Service Station" @@ -14584,4 +15711,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" #. @@ -14601,18 +15730,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 "Operatore" @@ -14621,5 +15752,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Semaforo" @@ -14629,5 +15760,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Tipo di attraversamento pedonale" @@ -14636,27 +15767,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 "non presidiato" -#: 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 "Semaforo" -#: 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 "isola spartitraffico" -#: 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 "non marcato" #. 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 "attraversamento a cavallo" @@ -14664,6 +15795,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 "attraversamento ciclabile" @@ -14672,11 +15803,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 "Attraversamento controllato" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Nome del tipo di attraversamento (UK)" @@ -14684,30 +15815,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 "strisce pedonali" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "attraversamento pedonale regolato da semaforo" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stop" @@ -14715,5 +15846,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Attraversamento pedonale" @@ -14722,14 +15853,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Modifica attraversamento pedonale" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Nome del tipo (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "mini-rotatoria" @@ -14740,14 +15871,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 "Direzione" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "senso orario" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Slargo per inversione di marcia" @@ -14757,20 +15888,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 "City Limit" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Modifica City Limit" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Secondo nome" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Speed Camera" @@ -14778,5 +15909,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Telefono di emergenza" @@ -14784,5 +15915,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Rampa" @@ -14790,5 +15921,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Rampa ripida" @@ -14797,10 +15928,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Guado" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Modifica guado" @@ -14808,5 +15939,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Passo montano" @@ -14814,5 +15945,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Modifica passo montano" @@ -14820,11 +15951,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 "Elevazione" @@ -14832,5 +15963,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barriere" @@ -14838,5 +15969,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Colonnina" @@ -14844,5 +15975,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Modifica colonnina" @@ -14887,16 +16018,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 "Traffico permesso:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Barriera per biciclette" @@ -14905,5 +16036,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Blocco" @@ -14911,5 +16042,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Griglia" @@ -14917,10 +16048,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Modifica griglia" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Trappola bus" @@ -14928,15 +16059,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Spunzoni" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Modifica spunzoni" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Casello (per pedaggio)" @@ -14944,5 +16075,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Modifica casello (per pedaggio)" @@ -14950,10 +16081,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Dogana" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Modifica dogana" @@ -14963,5 +16094,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Siepe" @@ -14970,5 +16101,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Recinto" @@ -14977,5 +16108,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Muro" @@ -14983,5 +16114,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Cinta muraria" @@ -14990,5 +16121,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Muro di contenimento" @@ -15000,15 +16131,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Punto di accesso" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Modifica punto di accesso" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Cancello" @@ -15016,50 +16147,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Modifica cancello" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Cancello a sollevamento" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Modifica cancello a sollevamento" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Cancello di filo spinato" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Modifica cancello di filo spinato" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Bump Gate" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Modifica un Bump Gate" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Kissing Gate" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Modifica un Kissing Gate" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Stile" @@ -15067,25 +16198,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Modifica scaletta" #. 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 "Porta di cinta muraria" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Modifica porta di cinta muraria" @@ -15096,10 +16227,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 "Acqua" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Sorgente" @@ -15107,5 +16238,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Modifica sorgente" @@ -15113,5 +16244,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Canale di scolo" @@ -15119,10 +16250,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Modifica un canale di scolo" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Torrente" @@ -15130,10 +16261,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Modifica un torrente" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Canale" @@ -15141,10 +16272,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Modifica un canale" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Fiume" @@ -15154,5 +16285,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 "Modifica un fiume" @@ -15160,15 +16291,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Modifica acqua" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Terraferma" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Modifica terraferma" @@ -15176,15 +16307,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Bacino" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Modifica area di bacino" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Serbatoio" @@ -15192,15 +16323,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Modifica area di riserva d'acqua" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Bacino coperto" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Modifica bacino coperto" @@ -15208,5 +16339,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Argine" @@ -15215,10 +16346,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Modifica un argine" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Zona umida" @@ -15229,14 +16360,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 "Modifica zona umida" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "palude" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "torbiera" @@ -15250,35 +16381,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "palude alluvionale" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "canneto" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "palude salata" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "barena" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangrovie" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Zona fangosa (sabbie mobili)" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Modifica zona fangosa (sabbie mobili)" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Spiaggia" @@ -15286,20 +16417,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Modifica spiaggia" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Baia" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Modifica baia" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Rupe" @@ -15307,10 +16438,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Modifica Rupe" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Linea di costa" @@ -15318,5 +16449,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Modifica linea di costa" @@ -15324,5 +16455,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Linea traghetto" @@ -15330,5 +16461,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Modifica una linea traghetto" @@ -15337,5 +16468,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Cantiere navale" @@ -15343,10 +16474,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Modifica cantiere navale" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Darsena/bacino navale" @@ -15354,5 +16485,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Modifica una darsena/bacino navale" @@ -15360,5 +16491,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Diga" @@ -15366,15 +16497,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Modifica una diga" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Punto di corso d'acqua" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Chiusa (non blocca la navigazione)" @@ -15383,5 +16514,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Sbarramento" @@ -15389,20 +16520,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Modifica sbarramento" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Cascata" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Modifica una cascata" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Punto di inversione di marcia" @@ -15411,15 +16542,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Porto turistico" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Modifica un porto turistico" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Passerella" @@ -15427,10 +16558,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Modifica passerella" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Terminal traghetti" @@ -15438,10 +16569,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Modifica terminal traghetti" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Rampa per la messa in acqua di imbarcazioni" @@ -15451,5 +16582,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 "Modifica una rampa per la messa in acqua di imbarcazioni" @@ -15457,10 +16588,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Ferrovia" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Ferrovia" @@ -15468,5 +16599,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Modifica una ferrovia" @@ -15496,8 +16627,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 "Tipi opzionali" @@ -15511,35 +16642,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 "tratto per lo smistamento delle merci" -#: 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 "tratto parallelo ad una ferrovia principale" -#: 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 "tratto per una società o ente" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Ferrovia a scartamento ridotto" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Modifica una ferrovia a scartamento ridotto" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorotaia" @@ -15547,45 +16678,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Modifica una monorotaia" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Ferrovia storica" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Modifica una ferrovia storica" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Metropolitana di superficie" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Modifica una metropolitana di superficie" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metropolitana" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Modifica una metropolitana" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tramvia" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Modifica una tramvia" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Rotaie del bus" @@ -15593,5 +16724,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Modificare le rotaie del bus" @@ -15600,14 +16731,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Ferrovia in disuso" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Modifica una ferrovia in disuso" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Ferrovia abbandonata" @@ -15616,5 +16747,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Passaggio a livello" @@ -15623,5 +16754,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Crossing" @@ -15631,5 +16762,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Tipo di attraversamento" @@ -15637,5 +16768,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Piattaforma ferroviaria girevole" @@ -15644,10 +16775,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Impianto di risalita" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Seggiovia" @@ -15655,10 +16786,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Modifica una seggiovia" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Ski-lift" @@ -15666,10 +16797,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Modifica uno ski-lift" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Cabinovia" @@ -15677,10 +16808,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Modifica una cabinovia" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Cabinovia" @@ -15688,5 +16819,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Modifica cabinovia" @@ -15694,5 +16825,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 "Stazione" @@ -15703,10 +16834,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 "Modifica stazione" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Stazione di rifornimento" @@ -15716,9 +16847,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 "Modifica una stazione di rifornimento" #. 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 "Orario di apertura" + +#. 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" @@ -15738,106 +17098,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Modifica parcheggio" #. 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 "Numero di riferimento" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "multi-piano" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "superficie" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "sotterraneo" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "parcheggio di interscambio" + +#. 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 "Tariffa" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Capacità" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Spazi per disabili" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Spazi per disabili" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Spazi per disabili" + +#: 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 "Autolavaggio" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Modifica autolavaggio" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Negozio" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Concessionaria" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Autofficina" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Modifica autofficina" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Noleggio" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Modifica noleggio automobili" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Condivisione" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Modifica condivisione automobili" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Modifica parcheggio per biciclette" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Capacità" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "superficie" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "multi-piano" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "sotterraneo" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "parcheggio di interscambio" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Spazi per disabili" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Tariffa" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Autolavaggio" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Modifica autolavaggio" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Negozio" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Concessionaria" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Autofficina" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Modifica autofficina" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Noleggio" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Modifica noleggio automobili" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Condivisione" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Modifica condivisione automobili" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Modifica parcheggio per biciclette" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Modifica noleggio biciclette" @@ -15846,15 +17241,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Modifica negozio di biciclette" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Trasporto pubblico" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Riferimento UIC" @@ -15862,5 +17257,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Stazione ferroviaria non presidiata" @@ -15868,5 +17263,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Modifica stazione non presidiata" @@ -15874,5 +17269,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Fermata del tram" @@ -15881,5 +17276,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Modifica fermata del tram" @@ -15887,5 +17282,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Piattaforma ferroviaria" @@ -15894,5 +17289,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Modifica una piattaforma ferroviaria" @@ -15904,5 +17299,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 "Riferimento (numero del tracciato)" @@ -15910,10 +17305,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 "Area" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Ingresso metropolitana" @@ -15922,10 +17317,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Modifica ingresso metropolitana" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Sedia a rotelle" @@ -15934,5 +17329,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Stazione degli autobus" @@ -15941,5 +17336,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Modifica una stazione degli autobus" @@ -15947,5 +17342,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Fermata dell'autobus" @@ -15955,5 +17350,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 "Modifica fermata dell'autobus" @@ -15962,8 +17357,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 "Pensilina/ricovero" @@ -15971,10 +17364,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Piattaforma fermata bus" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Modifica una piattaforma degli autobus" @@ -15982,5 +17375,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15988,5 +17381,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Stazione dei taxi" @@ -15994,5 +17387,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Aeroporto" @@ -16000,15 +17393,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Modifica aeroporto" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -16017,5 +17410,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Alloggiamento" @@ -16027,5 +17420,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -16034,15 +17427,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Modifica hotel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stelle" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -16050,20 +17443,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Modifica Motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Guest House" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Modifica Guest House" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Casetta (chalet)" @@ -16071,10 +17464,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Modifica casetta (chalet)" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Ostello" @@ -16082,30 +17475,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Modifica ostello" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Rifugio alpino" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Modifica rifugio alpino" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Area caravan e camper" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Modifica area caravan e camper" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Campeggio" @@ -16113,10 +17506,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Modifica campeggio" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Cibo+bevande" @@ -16127,5 +17520,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ristorante" @@ -16133,5 +17526,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Modifica ristorante" @@ -16139,5 +17532,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 "Cucina" @@ -16145,61 +17538,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 "italiana" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "cinese" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "greca" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "tedesca" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indiana" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regionale" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turca" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatica" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "tailandese" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "messicana" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "giapponese" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fast food" @@ -16207,9 +17600,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Modifica fast food" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Caffetteria" @@ -16217,10 +17610,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Caffetteria" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -16228,20 +17620,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Modifica Pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Modifica Biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16249,10 +17639,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Modifica Bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Club notturno" @@ -16260,33 +17649,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Modifica club notturno" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turismo" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attrazione turistica" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Modifica attrazione turistica" -#. 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 "Orario di apertura" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museo" @@ -16294,10 +17674,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Modifica museo" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16306,10 +17685,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Modifica zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Punto panoramico" @@ -16317,25 +17695,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Modifica punto panoramico" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Torre di avvistamento" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Parco divertimenti" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Modifica parco divertimenti" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Opera d'arte" @@ -16343,5 +17720,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Modifica opera d'arte" @@ -16349,86 +17726,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Ufficio informazioni" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Modifica ufficio informazioni" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Mappa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Tipo di mappa" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "mappa" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "mappa cittadina" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "mappa escursionistica" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "mappa ciclistica" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "strada" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "cinese" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Area da scaricare" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Incolla" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Città" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regionale" #. 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 "Descrizione più specifica" #. 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 "Ciclismo" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Percorso escursionistico montano" + +#. 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 "Sci" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "tratto parallelo ad una ferrovia principale" + +#. 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 "Tabellone informativo" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Tipo di tabellone" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "tavola" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Dogana" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "principante" + +#: build/trans_presets.java:1737 msgid "history" msgstr "storia" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "natura" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "fauna" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "tipologia di area" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Cartello di indicazioni (escursionismo)" -#. 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 "Informazioni" + +#. 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 "Descrizione più specifica" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Numero di telefono" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Altri punti informativi" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Modifica pensilina/ricovero" @@ -16436,25 +17938,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 "Caminetto" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Area picnic" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Modifica area picnic" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Luoghi storici" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Castello" @@ -16463,20 +17965,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Modifica castello" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Rovine" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Modifica rovine" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Sito archeologico" @@ -16485,10 +17986,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Modifica sito archeologico" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Campo di battaglia" @@ -16496,5 +17996,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Modifica campo di battaglia" @@ -16502,15 +18002,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monumento" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Modifica monumento" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Memoriale" @@ -16518,45 +18018,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Modifica memoriale" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Crocefisso" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Crocefisso" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Edicola votiva" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Modifica edicola votiva" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Svago" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Parco acquatico" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Modifica parco acquatico" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Parco giochi" @@ -16564,15 +18064,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Modifica parco giochi" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Riserva di pesca" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Modifica riserva di pesca" @@ -16580,15 +18080,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Strutture sportive" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadio" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Modifica stadio" @@ -16602,6 +18102,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 "seleziona uno sport:" @@ -16993,30 +18493,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 "sport" @@ -17026,227 +18526,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 "polivalente" -#: 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 "tiro con l'arco" -#: 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 "atletica" -#: 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 "football_australiano" -#: 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 "baseball" -#: 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 "pallacanestro" -#: 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 "boules" -#: 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 "boccie" -#: 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 "canoa" -#: 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 "arrampicata" -#: 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 "cricket" -#: 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 "reti_cricket" -#: 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 "croquet" -#: 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 "ciclismo" -#: 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 "cinodromo" -#: 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 "sport_equestri" -#: 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 "football_americano" -#: 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 "golf" -#: 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 "ginnastica" -#: 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 "hockey" -#: 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 "ippodromo" -#: 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 "autodromo" -#: 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 "pelota" -#: 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 "racchette" -#: 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 "rugby" -#: 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 "poligono_di_tiro" -#: 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 "skateboard" -#: 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 "pattinaggio" -#: 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 "comprensorio_sciistico" -#: 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 "calcio" -#: 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 "piscina" -#: 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 "ping_pong" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Centro sportivo" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Modifica centro sportivo" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Campo sportivo" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Modifica campo sportivo" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Circuito (pista)" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Modifica circuito (pista)" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Campo da golf" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Modifica campo da golf" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Modifica minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Struttura polivalente" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Modifica struttura polivalente" @@ -17285,248 +18783,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 "campo_sportivo" -#: 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 "centro_sportivo" -#: 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 "stadio" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Modifica bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletica" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Modifica atletica" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Tiro con l'arco" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Modifica tiro con l'arco" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Arrampicata" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Modifica arrampicata" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Canoa" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Modifca canoa" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Ciclismo" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Modifica ciclismo" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Corse dei cani" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Modifica corse dei cani" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Equitazione" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Modificare Equitazione" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Ippodromo" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Modifica ippodromo" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Ginnastica" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Modificare Ginnastica" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Sport motoristici" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Modifica Sport Motoristici" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Pattinaggio" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Modificare Pattinaggio" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Modificare Skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Piscina" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Modificare Nuoto" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Sci" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Modificare Sci" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Tipo di pista" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "Sci alpino" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "Sci nordico" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snow_park" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Difficoltà" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "principante" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "facile" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "intermedio" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "avanzato" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "esperto" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "freeride" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Poligono di tiro" @@ -17534,178 +19024,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Modifica poligono di tiro" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Sport (Pallone)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Calcio" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Modifica Calcio" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Football" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Modifica football" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Football australiano" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Modifica football australiano" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Modifica Baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Pallacanestro" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Modifica Pallacanestro" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Modifica Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "campo_da_golf" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule (sport popolare in Francia)" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Modifica boule (sport popolare in Francia)" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bocce" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Modifica Bocce" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Modifica Cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Reti per Cricket" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Modifica Reti per Cricket" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Modifica croquet" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Modifica Hockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Modifica Pelota" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Racquet" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Modifica racquet" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Modifica Rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Tennis da tavolo" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Modifica Tenniis da tavolo" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Modifica Tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Edifici" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Palazzo" @@ -17713,5 +19203,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Edificio pubblico" @@ -17719,10 +19209,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Modifica edificio pubblico" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Municipio" @@ -17730,10 +19220,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Modifica Municipio" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambasciata" @@ -17741,10 +19231,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Modifica ambasciata" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Tribunale" @@ -17753,10 +19243,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Modifica Palazzio del tribunale" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Prigione" @@ -17765,10 +19255,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Modifica Prigione" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Polizia" @@ -17778,10 +19268,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 "Modifica Polizia" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Vigili del fuoco" @@ -17790,10 +19280,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Modifica vigili del fuoco" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Ufficio Postale" @@ -17801,5 +19291,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Modifica Ufficio Postale" @@ -17807,15 +19297,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Asilo" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Modifica Asilo" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Scuola" @@ -17823,10 +19313,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Modifica Scuola" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Università" @@ -17834,10 +19324,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Modifica Università" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Scuola superiore" @@ -17845,5 +19335,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Modifica Scuola superiore" @@ -17851,5 +19341,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Cinema" @@ -17858,10 +19348,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Modifica Cinema" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Biblioteca" @@ -17870,10 +19360,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Modifica biblioteca" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Centro Artistico" @@ -17881,10 +19370,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Modifica centro d'arte" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teatro" @@ -17893,10 +19382,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Modifica Teatro" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Luogo di culto" @@ -17906,5 +19395,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 "Modifica Luogo di culto" @@ -17913,6 +19402,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 "Religione" @@ -17921,66 +19410,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 "bahaismo" -#: 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 "Buddista" -#: 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 "Cristiana" -#: 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 "induismo" -#: 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 "giainismo" -#: 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 "Ebraica" -#: 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 "Mussulmana" -#: 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 "sikh" -#: 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 "Spiritualista" -#: 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 "taoismo" -#: 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 "unitariano" -#: 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 "zoroastrismo" -#: 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 "Denominazione" @@ -17989,81 +19478,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 "Anglicana" -#: 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 "Battista" -#: 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 "Cattolica" -#: 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 "Evangelica" -#: 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 "Testimoni di Geova" -#: 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 "Luterana" -#: 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 "Metodista" -#: 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 "Mormone" -#: 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 "Ortodossa" -#: 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 "Pentecostale" -#: 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 "Prebiteriana" -#: 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 "Protestante" -#: 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 "Quacchera" -#: 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 "sciismo" -#: 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 "sunnismo" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Indirizzi" @@ -18072,5 +19561,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Modifica dati indirizzo" @@ -18078,5 +19567,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Numero civico" @@ -18084,20 +19573,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nome Casa" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Nome città" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Codice postale" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Codice nazione" @@ -18105,5 +19594,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolazione indirizzo" @@ -18112,5 +19601,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Modifica interpolazione indirizzo" @@ -18118,71 +19607,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Schema numerazione" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "dispari" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "pari" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "tutti" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alfabetico" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Costruzioni umane" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabbrica" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Modifica fabbrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Torre" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Modifica torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Torre idrica" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Modifica torre idrica" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasometro" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Modifica gasometro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Faro" @@ -18190,10 +19675,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Modifica faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Mulino a vento" @@ -18201,10 +19686,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Modifica mulino a vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Conduttura" @@ -18212,10 +19697,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Modifica conduttura" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Depuratore acqua" @@ -18225,10 +19710,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 "Modifica depuratore acqua" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Gru permanente" @@ -18236,10 +19721,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Modifica gru permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Torre radio" @@ -18247,10 +19732,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Modifica torre radio" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Punto geodetico o altra stazione fissa" @@ -18258,10 +19743,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Modifica punto geodetico o altra stazione fissa" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Telecamera di sorveglianza" @@ -18269,5 +19754,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Modifica telecamera di sorveglianza" @@ -18275,5 +19760,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Centrale elettrica" @@ -18283,39 +19768,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 "Modifica centrale elettrica" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "eolica" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "idroelettrica" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "a combustibile fossile" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "fissione nucleare" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "carbone" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "fotovoltaico" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Stazione elettrica" @@ -18324,10 +19809,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Modifica stazione elettrica" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Sottostazione elettrica" @@ -18336,5 +19821,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Modifica sottostazione elettrica" @@ -18342,10 +19827,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 "Riferimento linea" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Pilone (elettricità)" @@ -18356,5 +19841,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 "Modifica pilone (elettricità)" @@ -18362,5 +19847,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Linea elettrica" @@ -18369,46 +19854,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Modifica linea elettrica" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Tensione" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Numero di linee" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Servizi" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Bagni" -#. 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 "Numero di riferimento" - #. 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 "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Cassetta Postale" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefono" @@ -18417,5 +19896,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Modifica Telefono" @@ -18423,5 +19902,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 "Monete" @@ -18429,5 +19908,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 "Note" @@ -18435,5 +19914,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 "Portafogli elettronici e carte di debito" @@ -18441,5 +19920,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 "Carte di debito" @@ -18447,15 +19926,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 "Carte di credito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Carte telefoniche" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Riciclaggio" @@ -18464,5 +19943,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Modifica Stazione di riciclaggio" @@ -18470,80 +19949,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Lattine" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Vestiti" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Vetro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Carta" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Rottami metallici" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Panchina" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Postazione di caccia" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Modifica una postazione di caccia" -#. 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 "Modifica Albero" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "basso" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "mezzo" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "completo" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Nascondi" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Blocco" -#. 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 "Modifica Albero" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "basso" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "mezzo" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "completo" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontana" @@ -18552,10 +20027,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Modifica Fontana" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Acqua potabile" @@ -18564,10 +20039,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Modifica acqua potabile" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Culla per la vita" @@ -18575,25 +20050,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Modifica culla per la vita" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Negozi" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermercato" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Modifica Supermercato" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Casetta (chalet)" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Modifica casetta (chalet)" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Minimarket" @@ -18601,10 +20086,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Modifica minimarket" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Chiosco" @@ -18612,10 +20096,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Modificia Chiosco" -#. 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 "Modifica fermata dell'autobus" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Modifica albero singolo" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Distributore automatico" @@ -18623,5 +20126,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Modifica Distributore automatico" @@ -18629,88 +20132,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Distributore automatico" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "Biglietti trasporto pubblico" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "Orari trasporto pubblico" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "Biglietti per il parcheggio" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "Alimenti" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "Bevande" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "Dolci" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "Sigarette" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "Cibo per animali" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "Giornali" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "giocattoli" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "francobolli" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "Schede SIM" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "buoni_telefonici" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "buoni" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "preservativi" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "assorbenti" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "Sacchetto per escrementi" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Conto o carta fedeltà" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Macellaio" @@ -18718,10 +20221,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Modifica Macellaio" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Panificio" @@ -18729,10 +20231,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Modifica Panificio" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Fiorista" @@ -18740,20 +20241,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Modifica Fiorista" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Prodotti biologici" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Modifica negozio di prodotti biologici" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Alcolici (non in Italia)" @@ -18761,60 +20260,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Modifica negozio di alcolici (non in Italia)" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Bevande" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Modifica negozio di bevande" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Modifica negozio di informatica" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elettronica" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Modifica Negozio di Elettronica" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Modifica negozio di Hi-Fi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Mobilia" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Modifica Negozio di Mobilia" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Giardinaggio" @@ -18822,10 +20315,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Modifica giardinaggio" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Ferramenta" @@ -18833,10 +20325,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Modifica Negozio di Ferramenta" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Fai-da-te" @@ -18844,60 +20335,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Modifica negozio Fai-da-te" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Cartoleria" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Modifica cartoleria" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Parrucchiere/barbiere" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Modifica parrucchiere/barbiere" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Calzature" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Modifica Negozio di Scarpe" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Giocattoli" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Modifica Negozio di Giocattoli" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Videoteca" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Modifica videoteca" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Lavanderia a secco" @@ -18905,10 +20390,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Modifica Lavanderia a secco" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Lavanderia" @@ -18916,10 +20400,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Modifica lavanderia" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Sport all'aperto" @@ -18927,35 +20410,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Modifica sport all'aperto" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Articoli sportivi" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Modifica articoli sportivi" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Ottico" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Modifica Ottico" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Contanti" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banca" @@ -18963,16 +20443,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Modifica banca" -#. 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 "Bancomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Cambiavalute" @@ -18980,5 +20458,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Modifica cambiavalute" @@ -18986,15 +20464,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Modifica bancomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Salute" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Ambulatorio" @@ -19002,20 +20480,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Modifica ambulatorio" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dentista" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Modifica dentista" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Farmacia" @@ -19023,5 +20499,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Modifica Farmacia" @@ -19029,10 +20505,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Vendita medicinali con obbligo di prescrizione" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Ospedale" @@ -19040,10 +20515,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Modifica Ospedale" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Colonnina SOS" @@ -19052,5 +20527,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Modifica Colonnina SOS" @@ -19059,20 +20534,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Numero del punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Nome del punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Numero di telefono" #. 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 "(Usare prefisso internazionale, es. +12-345-67890)" @@ -19080,5 +20555,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 "Veterinario" @@ -19087,55 +20562,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Modifica veterinario" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Modifica continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Stato" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Modifica stato" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Regione" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Modifica regione" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Provincia" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Modifica provincia" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Contea (in Italia NON usare)" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Modifica contea (in Italia NON usare)" @@ -19143,15 +20618,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Città" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Modifica città" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Paese" @@ -19159,10 +20634,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Modifica Paese" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Sobborgo" @@ -19170,25 +20645,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Modifica Sobborgo" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Frazione" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Modifica Frazione" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Borgo" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Modifica Borgo" @@ -19196,5 +20671,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Luogo che ha un nome, ma non popolato" @@ -19202,10 +20677,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Località" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Isola" @@ -19213,11 +20688,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Modifica isola" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "sinistra" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Modifica casetta (chalet)" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Entrata di una grotta/caverna" @@ -19225,10 +20713,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Modifica entrata di una grotta/caverna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Picco montuoso" @@ -19236,10 +20724,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Modifica picco montuoso" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Ghiacciaio" @@ -19247,10 +20735,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Modifica Ghiacciaio" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulcano" @@ -19258,70 +20746,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Modifica vulcano" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Confini" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nazionale" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Modifica confine nazionale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Amministrativo" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Modifica confine amministrativo" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Modifica confine civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politico" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Modifica confine politico" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Parco nazionale" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Modifica Confine Parco Nazionale" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Uso del terreno" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Albero" @@ -19330,15 +20818,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Modifica albero singolo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Nome Botanico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Bosco" @@ -19347,5 +20835,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Modifica bosco" @@ -19353,17 +20841,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 "Conifere" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "deciduo (caducifoglie)" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "Mista" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Foresta" @@ -19372,14 +20860,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Modifica area di foresta" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Riserva naturale" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Modifica riserva naturale" @@ -19387,25 +20875,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Ghiaione" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Modifica Ghiaione" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Boscaglia" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Modifica boscaglia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Fell" @@ -19413,10 +20901,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Modifica Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Brughiera" @@ -19424,5 +20912,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Modifica brughiera" @@ -19430,5 +20918,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Aia" @@ -19437,45 +20925,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Modifica aia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Area agricola" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Modifica area agricola" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Prato" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Modifica area a prato" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vigna" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Modifica area di vigneto" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "" @@ -19484,25 +20972,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Giardino" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Modifica giardino" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Erba" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Modifica area di prato" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Village Green" @@ -19510,10 +20998,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Modifica Village Green" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Common (UK)" @@ -19521,20 +21009,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Modifica una Common (UK)" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Parco" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Modifica parco" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Area di svago" @@ -19542,5 +21030,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Modifica area di svago" @@ -19548,15 +21036,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Residential Landuse" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Modifica Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Cimitero" @@ -19564,9 +21052,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Modifica Cimitero" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cimitero" @@ -19574,39 +21062,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Modifica area di cimitero (esteso)" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Commerciale (negozi)" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Modifica area commerciale (negozi)" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Commerciale (uffici)" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Modifica area commerciale (uffici)" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industriale" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Modifica area industriale" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Deposito materiale ferroviario" @@ -19614,15 +21102,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Modifica deposito materiale ferroviario" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militare" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Modifica area militare" @@ -19630,55 +21118,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Area in costruzione" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Modifica area in costruzione" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Ridestinazione d'uso" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Modifica area di ridestinazione d'uso" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Area agricola destinata alla costruzione" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Modifica area agricola destinata alla costruzione" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Discarica" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Modifica area di discarica" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Cava" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Modifica area di cava/miniera" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multi-poligono" @@ -19688,5 +21176,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 "Modifica un multi-poligono" @@ -19695,10 +21183,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "segmento esterno" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "segmento interno" @@ -19706,5 +21194,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Divieto di svolta" @@ -19713,5 +21201,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Modifica un divieto di svolta" @@ -19719,34 +21207,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Divieto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "no svolta a sinistra" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "no svolta a destra" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "non diritto" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "no inversione di marcia" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "solo svolta a destra" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "solo svolta a sinistra" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "solo diritto" @@ -19755,15 +21243,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "dal percorso" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "attraverso il nodo o percorso" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "verso il percorso" @@ -19771,5 +21259,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Percorso" @@ -19778,5 +21266,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Modifica un percorso" @@ -19784,5 +21272,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Tipo di percorso" @@ -19854,5 +21342,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 @@ -19861,17 +21349,17 @@ msgstr "bicicletta" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "strada" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "traghetto" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "sci" @@ -19924,5 +21412,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 @@ -19931,13 +21419,13 @@ msgstr "pedone" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "escursionismo" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "deviazione" @@ -19951,10 +21439,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metropolitana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Descrizione del simbolo" @@ -19962,31 +21450,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Rete" #. 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 "proposto" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternativo" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporaneo" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "collegamento" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Colore (esadecimale)" @@ -19995,30 +21483,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "segmento di percorso" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "segmento diretto" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "segmento opposto" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "punto di fermata" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "punto di fermata diretto" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "punto di fermata opposto" @@ -20456,11 +21944,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 "deprecato" @@ -20786,41 +22274,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 "strada" #. color street @@ -22521,5 +23972,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 "acqua (chiaro)" @@ -23118,55 +24569,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23180,5 +24582,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 "turismo" @@ -23250,8 +24652,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 "attrazione storica" @@ -23322,8 +24724,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 "verde" @@ -23337,5 +24739,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "cava/miniera" @@ -23349,5 +24751,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "discarica" @@ -23369,5 +24771,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "bacino" @@ -23381,5 +24783,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "foresta" @@ -23393,5 +24795,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "aia" @@ -23414,5 +24816,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "area commerciale (negozi)" @@ -23426,5 +24828,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industriale" @@ -23438,5 +24840,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "ridestinazione d'uso" @@ -23450,5 +24852,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "area agricola destinata alla costruzione" @@ -23462,5 +24864,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "area ferroviaria" @@ -23517,7 +24919,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 "militare" @@ -23531,5 +24933,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cimitero" @@ -23542,5 +24944,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "picco montuoso" @@ -23555,5 +24957,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "ghiacciaio" @@ -23567,5 +24969,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulcano" @@ -23620,8 +25022,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 "elemento naturale" @@ -23635,5 +25037,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "boscaglia" @@ -23647,20 +25049,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "brughiera" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "bosco" - #. color water #. 1 @@ -23671,5 +25061,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "zona fangosa (sabbie mobili)" @@ -23683,5 +25073,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "spiaggia" @@ -23759,8 +25149,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 "percorso" @@ -23808,7 +25198,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 "confine" @@ -23950,10 +25340,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 "luogo" @@ -24001,6 +25400,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 "indirizzo" @@ -24297,12 +25696,102 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Selezionare la tabella di assemblaggio" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Regola la posizione del livello WMS (solo immagini non vettoriali)" - -#~ msgid "Not implemented yet." -#~ msgstr "Non ancora implementato." +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati " +#~ "sul server." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala " +#~ "questo come bug." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Cancella {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Rimuovere il membro della relazione {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Impossibile aprire la cartella delle preferenze: {0}" + +#~ msgid "nodes" +#~ msgstr "nodi" + +#~ msgid "ways" +#~ msgstr "vie" + +#~ msgid "relations" +#~ msgstr "relazioni" + +#~ msgid "changesets" +#~ msgstr "gruppi di modifiche" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "E'' fallito il caricamento dello storico dal server. Dettagli:
" +#~ "{0}" + +#~ msgid "Delete Layer" +#~ msgstr "Elimina livello" + +#~ msgid "Delete all" +#~ msgstr "Elimina tutto" + +#~ msgid "Authors: {0}" +#~ msgstr "Autori: {0}" + +#~ msgid "Public" +#~ msgstr "Pubblico" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Se selezionato rende pubblico il proprio tracciato in openstreetmap.org" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Imposta le coordinate di Lambert" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di " +#~ "caricarlo." + +#~ msgid "Continue anyway" +#~ msgstr "Continua comunque" + +#~ msgid "Copy Default" +#~ msgstr "Copia predefinito" + +#~ msgid "Edit Information Office" +#~ msgstr "Modifica ufficio informazioni" + +#~ msgid "Map Type" +#~ msgstr "Tipo di mappa" + +#~ msgid "map" +#~ msgstr "mappa" + +#~ msgid "citymap" +#~ msgstr "mappa cittadina" + +#~ msgid "hikingmap" +#~ msgstr "mappa escursionistica" + +#~ msgid "bicyclemap" +#~ msgstr "mappa ciclistica" + +#~ msgid "Board Type" +#~ msgstr "Tipo di tabellone" + +#~ msgid "board" +#~ msgstr "tavola" #~ msgid "Data Layer" @@ -24648,4 +26137,7 @@ #~ "corrente {1}" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Selezionare la tabella di assemblaggio" + #~ msgid "Remove Selected" #~ msgstr "Elimina gli elementi selezionati" @@ -24818,4 +26310,7 @@ #~ "sull'unione." +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Regola la posizione del livello WMS (solo immagini non vettoriali)" + #~ msgid "Undeleting relation..." #~ msgstr "Ripristino relazione..." @@ -24838,7 +26333,4 @@ #~ msgid "Missing primitive" #~ msgstr "Primitiva mancante" - -#~ msgid "image loading..." -#~ msgstr "caricamento immagine..." #~ msgid "Failed to initialize API. Please try again later." Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 17484) +++ /applications/editors/josm/i18n/po/ja.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-15 13:48+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-06 04:01+0000\n" +"Last-Translator: Hiroshi Miura \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" "X-Generator: Launchpad (build Unknown)\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 "メインGUIを作成します。" #. 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 "" - -#: ../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 +msgstr "投影法 {0} は、使用可能できませんでした。メルカトル図法を使います。" + +#: ../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 @@ -96,155 +99,159 @@ #: ../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] "保存されていない変更があります。変更分を破棄して継続しますか？" + +#: ../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 "不正な形式のURLの\"{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 "不正な形式のファイルURL\"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -269,7 +276,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" @@ -307,5 +315,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" @@ -326,9 +334,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 msgid "License" -msgstr "" +msgstr "ライセンス" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "Plugins" msgstr "プラグイン" @@ -345,13 +353,22 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +"少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してくだ" +"さい。" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -360,19 +377,19 @@ msgstr "" -#: ../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 "" +msgstr "対象のレイヤーを選択してください。" #: ../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 +msgstr "マージ" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -380,8 +397,10 @@ "" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +"統合元のレイヤー
''{0}''
を、統合する先のレイヤーがありません。" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" -msgstr "" +msgstr "対象のレイヤーがありません。" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -396,11 +415,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 @@ -429,5 +448,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 "緯度" @@ -436,30 +455,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 @@ -473,6 +492,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 @@ -480,58 +499,57 @@ 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 "少なくとも3つのノードを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -539,11 +557,12 @@ "{0}, max is {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 +"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +msgstr "API機能違反" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -552,5 +571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -558,47 +577,50 @@ "length {2}. Values length is {3}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}" +"です。値の長さは{3}です。" + +#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。" + +#: ../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 @@ -608,22 +630,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 "結合する少なくとも二つのウエイを選択してください。" @@ -634,4 +656,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 " @@ -641,13 +667,13 @@ "か？" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +msgid "Reverse and Combine" +msgstr "逆転して接続" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -655,31 +681,26 @@ msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -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: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 " @@ -688,55 +709,57 @@ "ウエイを結合できません（これらをノードの一列として統合することができません）" +#: ../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 "3つのノードから円形を作成します" -#: ../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 " "three nodes." msgstr "" +"２つないしは３つのノード、または２つないしは３つのノードをもつ一つのウエイだ" +"け、を選択してください。" #: ../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 "削除" @@ -746,85 +769,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 "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgstr "OSMから参照をダウンロードします。" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -833,6 +857,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 "複製" @@ -856,85 +880,91 @@ 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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "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オンラインヘルプからのページのみ編集できます。" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -986,22 +1016,26 @@ 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 " @@ -1009,78 +1043,74 @@ msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？" -#: ../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 "" "ノードを結合できません：使用しているウェイを削除しないとけなくなります。" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "少なくとも1つはノードかウェイを選んでください。" -#: ../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 "オブジェクトを世界の外に移動できません。" @@ -1088,5 +1118,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 "新規" @@ -1096,17 +1126,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 "" +#: ../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 @@ -1144,21 +1179,17 @@ msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。" -#: ../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 "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" -#: ../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 " @@ -1167,9 +1198,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 "垂直化" @@ -1185,14 +1216,25 @@ 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} 読み込み中です" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1218,37 +1260,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 "" +#: ../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 "ウェイ方向反転" @@ -1256,10 +1293,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 "最新データを保存します。" @@ -1270,37 +1308,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 " @@ -1310,28 +1336,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 "現在のデータを新規ファイルに保存" @@ -1365,38 +1391,38 @@ 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." msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。" -#: ../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 " @@ -1409,15 +1435,15 @@ "てください。" -#: ../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." msgstr[0] "選択したウエイは選択したノードをつかって構成されていません。" -#: ../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 "" @@ -1425,5 +1451,5 @@ "す。" -#: ../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 " @@ -1433,5 +1459,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 " @@ -1439,5 +1465,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 " @@ -1445,8 +1471,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 @@ -1464,58 +1515,58 @@ 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 "* 1つのタグのついたノード、または" -#: ../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 "* 1つ以上のウェイに使われている1つのノード, または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" + #: ../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 "" -"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" -#: ../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" @@ -1530,9 +1581,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" @@ -1540,5 +1591,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" @@ -1584,61 +1635,71 @@ "ターの再ダウンロード)" -#: ../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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "" -#: ../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 "" @@ -1652,17 +1713,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1673,32 +1734,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1706,31 +1805,76 @@ 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 +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] "追加するオブジェクト:" + +#: ../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] "修正するオブジェクト:" + +#: ../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] "削除するオブジェクト:" + +#: ../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 @@ -1754,20 +1898,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 "早回し" @@ -1809,10 +1953,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 "ゆっくり再生" @@ -1840,31 +1984,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 "ダウンロード {1}のうち{0} (残り {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 "" @@ -1876,20 +2016,20 @@ msgstr "" -#: ../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 @@ -1898,5 +2038,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 " @@ -1906,55 +2046,69 @@ "ノードは消さない。 Ctrl: 参照するオブジェクトを消す。" -#: ../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 "" +#: ../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 @@ -1962,38 +2116,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." @@ -2001,14 +2155,14 @@ msgstr[0] "新規ノードを {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 "描画の完了" @@ -2028,5 +2182,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 "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" @@ -2037,5 +2191,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 "回転を止めるには、マウスボタンを放します。" @@ -2053,17 +2207,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" @@ -2071,25 +2226,29 @@ msgstr[0] "仮の新規ノードを {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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." @@ -2098,5 +2257,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-" @@ -2123,62 +2282,62 @@ "移動; 右ドラッグによるズーム" +#: ../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:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"ベイカー・ストリート - どんなキーや名前の 'ベイカー' と 'ストリート'。" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"ベイカー・ストリート - どんなキーや名前の 'ベイカー' と 'ストリート'。" +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"ベイカー・ストリート\" - どんなキーや名前の 'ベイカー・ストリート'。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"ベイカー・ストリート\" - どんなキーや名前の 'ベイカー・ストリート'。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' その名前のどこか。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" -#: ../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, " @@ -2188,110 +2347,111 @@ "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=任意の値を入力してください." -#: ../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:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - オブジェクトの型 (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - オブジェクトの型 (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - 該当ユーザに変更された全オブジェクト" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java: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 "変更済み - すべての変更されたオブジェクト" -#: ../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 "選択- すべての選択されたオブジェクト" -#: ../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 "未完了 - すべての未完了のオブジェクト" -#: ../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" msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../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" msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../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 "| や ORを、論理和をとるために使う" -#: ../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 "\" を演算子をくくるために使ってください。（例：キーが：を含む)" -#: ../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" @@ -2360,58 +2520,96 @@ msgstr "" -#: ../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 "URL: \"{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 "URL: \"{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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../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 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../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}このオブジェクトを変更" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "{0}の最後の変更" + +#: ../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 "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Remove \"{0}\" for {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 "Remove \"{0}\" for {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Set {0}={1} for {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 "Set {0}={1} for {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Set {0}={1} for {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" @@ -2419,10 +2617,10 @@ msgstr[0] "オブジェクト" -#: ../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 "Remove \"{0}\" for {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}" @@ -2434,5 +2632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2441,10 +2639,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2453,5 +2651,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}''" @@ -2475,44 +2673,56 @@ 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}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "削除モード" + +#: ../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}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "関連から削除" + +#: ../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 "ウェイのセグメントを分割" @@ -2520,6 +2730,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." @@ -2531,5 +2741,5 @@ "起こします。
本当に削除しますか？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2540,5 +2750,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2573,10 +2783,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2589,18 +2809,38 @@ msgstr "シーケンス" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2626,13 +2866,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 "新しいロール" @@ -2651,63 +2891,120 @@ #: ../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 "" @@ -2721,29 +3018,36 @@ msgstr "" -#: ../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}" @@ -2755,15 +3059,229 @@ msgstr "" -#: ../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 "Error: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Warning: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "経由地が複数有ります。" + +#: ../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 "経由地かウエイが見つかりません。" + +#: ../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 "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" + +#: ../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 "" + +#: ../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" @@ -2771,22 +3289,7 @@ msgstr[0] "ノード" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Error: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Warning: {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" @@ -2794,12 +3297,7 @@ msgstr[0] "ウェイ" -#: ../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" @@ -2807,244 +3305,4 @@ msgstr[0] "関連" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{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}ノード" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "経由地が複数有ります。" - -#: ../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 "経由地かウエイが見つかりません。" - -#: ../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 "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" - -#: ../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 "" - -#: ../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" @@ -3057,5 +3315,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "背景" @@ -3065,5 +3323,5 @@ msgstr "ハイライト" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3073,5 +3331,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3087,21 +3345,21 @@ "新しいレイヤーを新しいゾーンで開始してください。" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "ランベルトゾーン（フランス）" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "ランベルトゾーン（エストニア）" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "メルカトル" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "スイスグリッド (スイス)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3122,8 +3380,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3131,15 +3389,99 @@ #: ../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/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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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}ノード" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} メンバー" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "" @@ -3149,36 +3491,9 @@ msgstr "" -#: ../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 "" @@ -3188,9 +3503,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 "" @@ -3199,9 +3514,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3210,9 +3525,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 "" @@ -3222,9 +3548,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 "" @@ -3234,11 +3560,6 @@ msgstr "" -#: ../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 "" @@ -3256,38 +3577,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 " @@ -3297,5 +3618,5 @@ "ル名を指定できます。" -#: ../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 " @@ -3305,5 +3626,5 @@ "かファイル名で指定できます。" -#: ../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 " @@ -3313,75 +3634,94 @@ "すURLで指定できます。" -#: ../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 "bounding boxをダウンロード" -#: ../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 を含む) URLを位置と解釈してダウンロード" -#: ../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 "ファイルを開く（.gpxの場合生のGPSとして)" -#: ../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 "bounding boxを生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" @@ -3391,47 +3731,47 @@ "読み込まれることにご注意ください。" -#: ../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." msgstr "設定 {0} はもう使われていないので、除かれました。" -#: ../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 @@ -3443,21 +3783,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 "音声" @@ -3497,58 +3837,44 @@ 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 "" - -#: ../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 "" @@ -3560,10 +3886,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 @@ -3622,7 +3942,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" @@ -3638,5 +3957,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" @@ -3739,5 +4058,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 "" @@ -3748,5 +4067,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" @@ -3760,5 +4079,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 "" @@ -3833,6 +4152,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" @@ -3942,10 +4261,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 "" @@ -3954,19 +4273,19 @@ msgstr "" -#: ../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 "" @@ -3975,5 +4294,5 @@ msgstr "" -#: ../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 "" @@ -3991,9 +4310,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 " @@ -4001,110 +4320,112 @@ 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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4113,21 +4434,21 @@ msgstr "" -#: ../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 "" @@ -4166,10 +4487,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 @@ -4178,10 +4500,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 @@ -4195,5 +4518,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}" @@ -4234,4 +4557,136 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 +#, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 +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}ウェイ" + +#: ../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} 関連" + +#: ../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}ウェイ" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4247,10 +4702,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 @@ -4258,5 +4713,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}" @@ -4287,36 +4742,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 "" @@ -4328,150 +4777,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 "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "" - -#: ../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 "" - -#: ../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." @@ -4479,28 +4896,22 @@ msgstr[0] "これは、最大{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" @@ -4508,89 +4919,84 @@ msgstr[0] "{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 "プロパティの削除" @@ -4599,34 +5005,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 "" @@ -4659,21 +5065,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}ウェイ" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} 関連" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4681,14 +5075,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." @@ -4697,64 +5086,95 @@ "ます。" -#: ../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] "作者" + +#: ../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 +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 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "" @@ -4763,47 +5183,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 " @@ -4812,14 +5226,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 "" @@ -4829,9 +5243,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 "" @@ -4841,15 +5255,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4857,5 +5271,5 @@ msgstr "" -#: ../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 " @@ -4863,20 +5277,20 @@ msgstr "" -#: ../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 "" @@ -4885,57 +5299,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 " @@ -4944,9 +5358,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 "" @@ -4955,20 +5369,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 @@ -4978,37 +5388,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 "" @@ -5018,30 +5428,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 "" @@ -5055,22 +5465,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 "" @@ -5103,34 +5518,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] "" -msgstr[1] "" - -#: ../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 "最初にブックマークを選択してください、" @@ -5186,13 +5588,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 "地名検索結果をサーバから読み取ることができませんでした" @@ -5200,18 +5602,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 "名前" @@ -5250,37 +5651,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: " @@ -5289,5 +5690,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 "スリッピーマップ" @@ -5314,46 +5715,74 @@ msgstr "タイル数" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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}" +#: ../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}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5672,14 +6101,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5855,8 +6298,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" #. @@ -5953,4 +6402,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6064,6 +6516,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 @@ -6071,153 +6523,171 @@ #: 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 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../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 @@ -6226,32 +6696,282 @@ msgstr "" -#: ../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 +#, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 +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}×{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 @@ -6259,29 +6979,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" @@ -6289,14 +7009,14 @@ msgstr[0] "画像" -#: ../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 @@ -6304,82 +7024,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 "ファイル\"{0}\"にEXIFの時刻情報がありません。" -#: ../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/dd/yyyy HH:MM:SS)" -#: ../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" @@ -6436,5 +7156,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}" @@ -6450,10 +7170,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." @@ -6465,11 +7185,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 @@ -6511,4 +7231,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." @@ -6531,74 +7256,74 @@ "外します。" -#: ../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 "" -#: ../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" msgstr[0] "トラック" -#: ../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" msgstr[0] "ポイント" -#: ../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" @@ -6606,5 +7331,5 @@ msgstr[0] "{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" @@ -6612,5 +7337,5 @@ msgstr[0] "{1}トラックを含む {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} point" @@ -6618,14 +7343,14 @@ msgstr[0] "{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" msgstr[0] "マーカー" -#: ../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" @@ -6645,5 +7370,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}." @@ -6651,5 +7376,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 "再生されているレイヤーと同期させることができません。" @@ -6677,5 +7402,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 " @@ -6685,5 +7410,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 " @@ -6693,29 +7418,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 "(URLは： " -#: ../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 @@ -6723,26 +7448,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 @@ -6750,14 +7475,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 "新しいキー/値の組を入力" @@ -6892,40 +7617,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 "色" @@ -6969,5 +7694,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "自動車" @@ -6989,16 +7714,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:" #. @@ -7028,12 +7754,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 "徒歩" @@ -7209,5 +7935,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 "起動時にスプラッシュ・スクリーンを表示する" @@ -7215,23 +7941,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 "ルック＆フィール" @@ -7263,54 +8000,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 プラグイン情報のURLの追加" -#: ../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 プラグイン情報のURLを編集" -#: ../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 " @@ -7318,41 +8055,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 "地図投影法" @@ -7385,12 +8122,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サーバのベースURL（REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "サーバのベースURL" #. 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 @@ -7417,61 +8146,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7645,36 +8373,59 @@ 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] "" +msgstr[1] "" + +#: ../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 "グループ \"{1}\"のプリセット\"{0}\"を使います" -#: ../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 @@ -7682,15 +8433,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 @@ -7699,22 +8450,22 @@ msgstr[0] "{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}''" @@ -7753,11 +8504,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 " @@ -7767,38 +8518,38 @@ "ラックをアップロードしないでください。" -#: ../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 "GPXファイル" -#: ../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メール" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../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 "Copyright 年" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "キーワード" @@ -7808,9 +8559,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 "" @@ -7821,10 +8572,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 @@ -7834,12 +8585,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 "" -#: ../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" @@ -7860,6 +8611,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 @@ -7869,20 +8620,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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 " @@ -7890,34 +8661,34 @@ msgstr "" -#: ../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のインポートに失敗しました。" @@ -7928,9 +8699,9 @@ msgstr "" -#: ../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 "" @@ -7941,15 +8712,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 "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7957,33 +8728,91 @@ msgstr "" -#: ../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 "diffアップロードのための変更セットを用意できませんでした。" -#: ../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}." @@ -8011,42 +8840,50 @@ msgstr "" -#: ../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サーバのベースURL（REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "サーバのベースURL" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../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." @@ -8055,20 +8892,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSMサーバファイル" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8077,5 +8914,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8268,35 +9105,46 @@ msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。" -#: ../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 "" @@ -8309,5 +9157,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." @@ -8316,23 +9164,23 @@ "{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:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "プラグイン {1} には JOSMのバージョン {0} が必要です。" -#: ../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 "" @@ -8343,10 +9191,10 @@ 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}." @@ -8355,5 +9203,5 @@ "す。" -#: ../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." @@ -8361,15 +9209,15 @@ "プラグイン {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 " @@ -8379,21 +9227,21 @@ "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 " @@ -8403,5 +9251,5 @@ "上書きできる権限があるかどうか、確認してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8409,10 +9257,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." @@ -8421,9 +9269,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 " @@ -8433,13 +9281,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" @@ -8450,5 +9298,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" @@ -8456,18 +9304,18 @@ msgstr[0] "{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 "" -#: ../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 "" @@ -8480,9 +9328,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 "" @@ -8495,35 +9343,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}: Version {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 "Error reading plugin information file: {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" @@ -8538,18 +9386,18 @@ "大目にみて、ぜひバグレポートをぜひお願いします。" -#: ../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 "（できる限り詳細に）エラーが発生するまでの手順を含めてください！" -#: ../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 " @@ -8559,19 +9407,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 "Unable to find translation for the locale {0}. Reverting to {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 "" @@ -8580,5 +9428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8587,5 +9435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8599,5 +9447,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" @@ -8607,5 +9455,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8616,21 +9464,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 "" @@ -8659,9 +9542,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 @@ -8669,27 +9570,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}" @@ -8697,47 +9611,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 "GPSトラックをアップロード中：{0}% ({1} of {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トラックのアップロード" @@ -8850,19 +9764,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." @@ -8874,34 +9788,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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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" @@ -8911,29 +9825,29 @@ "入力する形式を確認してください。" -#: ../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 "" -#: ../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 "" @@ -8941,41 +9855,41 @@ "html>" -#: ../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 "" @@ -8986,9 +9900,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 "" @@ -8999,26 +9913,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 "GPX トラック {2} に、{1}中に{0}枚発見しました。" -#: ../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." @@ -9027,39 +9941,39 @@ "してください。" -#: ../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 " @@ -9067,13 +9981,13 @@ msgstr "" -#: ../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 "デフォルトの値" @@ -9094,5 +10008,5 @@ msgstr "ファイル{0}にエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9105,12 +10019,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 "ファイルの読み込みエラー" @@ -9139,8 +10052,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" @@ -9151,21 +10064,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 "Cadastre" -#: ../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" @@ -9174,37 +10087,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 "最大キャッシュサイズをMB単位で指定します。" -#: ../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." @@ -9216,18 +10140,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "French cadastre 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 "" -#: ../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 " @@ -9235,5 +10159,5 @@ msgstr "元の白い背景を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). " @@ -9242,41 +10166,39 @@ "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。" -#: ../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 "このサイズを超えると古いファイルは自動的に削除されます" @@ -9334,12 +10256,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "WMSサーバに接続中..." +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 @@ -9373,20 +10293,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" @@ -9394,9 +10314,14 @@ 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 +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" @@ -9404,31 +10329,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 "移動する位置の緯度経度を入力" - -#: ../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 @@ -9490,6 +10423,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)" @@ -9512,6 +10445,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 "ブランクのレイヤー" @@ -9527,7 +10460,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 @@ -10051,6 +10984,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 "水域(湖沼)" @@ -10063,8 +10996,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 @@ -10351,9 +11280,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 " @@ -10362,5 +11291,5 @@ msgstr "" -#: ../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 "" @@ -10929,5 +11858,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 "ストリートの名前" @@ -10946,29 +11875,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 "申し訳ありません。匿名のユーザでは利用できません。" @@ -10982,23 +11911,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 "現在最大2つまでのエリアのみ結合できます。" -#: ../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 "" -#: ../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" @@ -11007,38 +11928,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -11046,82 +11967,82 @@ msgstr "" -#: ../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 "移動する位置の緯度経度を入力" -#: ../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 "www.openstreetmap.orgから、URLを貼り付けることもできます。" -#: ../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 "" "緯度、経度、ズームを解析することができませんでした。確認をしてください。" -#: ../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?" @@ -11131,25 +12052,25 @@ msgstr[1] "" -#: ../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 "" @@ -11238,53 +12159,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" @@ -11309,20 +12230,52 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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: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 @@ -11405,23 +12358,23 @@ msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。" -#: ../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 "" @@ -11432,7 +12385,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 "不正なタグ/値の組み合わせです" @@ -11440,80 +12393,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 "タグチェッカーのソース" -#: ../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." @@ -11521,82 +12474,82 @@ msgstr "" -#: ../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 "" -#: ../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 "FIXMEをチェック" -#: ../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 "Check for paint notes." -#: ../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 "既定のスペルチェックファイルを使用(推奨)" -#: ../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}''" @@ -11741,7 +12694,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 "ビル" @@ -11755,5 +12708,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 "領域" @@ -11889,5 +12842,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "例外が発生しました" @@ -11932,14 +12885,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}" @@ -11950,26 +12903,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 "" -#: ../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 "" -#: ../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 " @@ -11977,37 +12930,55 @@ msgstr "" -#: ../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 "" -#: ../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 "" @@ -12020,15 +12991,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" @@ -12036,89 +13035,100 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../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 "" -#: ../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 "" -#: ../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}" msgstr "未サポートの 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 URL" -#: ../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 "メニュー名とWMS URLを入力" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "既定のコピー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12494,62 +13504,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" @@ -12564,5 +13519,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 "車線数" @@ -12577,5 +13532,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" @@ -12585,10 +13539,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 "最高速度（km/h）" @@ -12632,9 +13586,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 "一方通行" @@ -12682,13 +13636,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 "橋" @@ -12730,13 +13684,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 "トンネル" @@ -12776,12 +13730,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 "切り通し" @@ -12821,12 +13775,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 "土手" @@ -12982,17 +13936,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 "幅(m)" @@ -13019,4 +13973,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" @@ -13035,11 +13990,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 "表面" @@ -13049,4 +14005,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" @@ -13061,9 +14018,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 "舗装" @@ -13071,10 +14029,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" @@ -13082,12 +14103,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)" @@ -13168,20 +14271,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 "行き止まり(cul-de-sac)" @@ -13194,8 +14297,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 "アクセス" @@ -13230,32 +14333,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 "はい" @@ -13268,40 +14386,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 "指定済み" @@ -13314,19 +14432,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 "行き先" @@ -13349,65 +14467,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 "貨物トラック" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "大型車" @@ -13422,10 +14545,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 "馬" @@ -13441,17 +14564,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" @@ -13463,30 +14585,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 "最小速度（km/h)" @@ -13494,25 +14616,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 "ロータリー交差点" @@ -13523,5 +14645,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 "ジャンクションの編集" @@ -13537,5 +14659,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" #. @@ -13543,9 +14665,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 "タイプ" @@ -13565,10 +14687,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 "高速道路のランプ" @@ -13590,10 +14712,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 "国道の連絡路" @@ -13615,10 +14737,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 "都道府県道の連絡路" @@ -13640,5 +14762,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" @@ -13653,9 +14775,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 "１車線道" @@ -13669,9 +14791,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 "私道" @@ -13701,10 +14823,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 "バスレーン" @@ -13734,6 +14856,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 "工事中" @@ -13744,10 +14866,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 "トンネルの編集" @@ -13755,19 +14877,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 "ジャンクション" @@ -13783,5 +14905,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "ロータリー交差点" @@ -13790,5 +14912,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "馬道" @@ -13796,5 +14918,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "馬道の編集" @@ -13802,5 +14924,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "自転車道" @@ -13810,11 +14932,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 "歩道" @@ -13823,11 +14951,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 "ペデストリアン・歩行者用市街道路" @@ -13836,5 +14970,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "ペデストリアンデッキ、歩行者専用道路の編集" @@ -13842,5 +14976,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "階段" @@ -13850,5 +14984,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 "" @@ -13857,5 +14991,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "トラック" @@ -13864,39 +14998,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" @@ -13905,5 +15011,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "トラック グレード 1　の編集" @@ -13911,5 +15017,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" @@ -13918,5 +15024,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "トラック グレード 2の編集" @@ -13924,5 +15030,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" @@ -13931,5 +15037,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "トラック グレード 3　の編集" @@ -13937,5 +15043,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" @@ -13944,5 +15050,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "トラック グレード 4　の編集" @@ -13950,5 +15056,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" @@ -13957,5 +15063,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "トラック グレード 5 の編集" @@ -13964,5 +15070,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "小道" @@ -13971,19 +15077,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 "ハイキング" @@ -13993,5 +15102,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 "ハイキングの編集" @@ -13999,5 +15108,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "山岳ハイキング" @@ -14007,5 +15116,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 "山岳ハイキングの編集" @@ -14013,5 +15122,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "厳しい山岳ハイキング" @@ -14021,5 +15130,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 "厳しい山岳ハイキングの編集" @@ -14027,5 +15136,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "高山ハイキング" @@ -14035,5 +15144,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 "高山ハイキングの編集" @@ -14041,5 +15150,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "厳しい高山ハイキング" @@ -14049,5 +15158,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 "厳しい高山ハイキングの編集" @@ -14055,5 +15164,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "困難な高山ハイキング" @@ -14063,5 +15172,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 "困難な高山ハイキングの編集" @@ -14069,10 +15178,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 "高速道路のジャンクション" @@ -14080,15 +15189,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 "サービス" @@ -14096,5 +15205,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "サービスステーションの編集" @@ -14108,4 +15217,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" #. @@ -14125,18 +15236,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 "操作員" @@ -14145,5 +15258,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "信号機" @@ -14153,5 +15266,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "横断歩道タイプ" @@ -14160,27 +15273,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 "馬用横断道" @@ -14188,6 +15301,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 "自転車用横断歩道" @@ -14196,11 +15309,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 "踏切タイプ名(UK)" @@ -14208,30 +15321,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 "Toucan柄横断歩道（ＵＫ）" -#: 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 "停止" @@ -14239,5 +15352,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "横断歩道" @@ -14246,14 +15359,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 "小さなラウンドアバウト" @@ -14264,14 +15377,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 "転回場" @@ -14281,20 +15394,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 "スピードカメラ（オービス）" @@ -14302,5 +15415,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "緊急電話" @@ -14308,5 +15421,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "坂" @@ -14314,5 +15427,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "急な坂" @@ -14321,10 +15434,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 "浅瀬（歩いて渡る）" @@ -14332,5 +15445,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "峠道" @@ -14338,5 +15451,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "峠道の編集" @@ -14344,11 +15457,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 "高度" @@ -14356,5 +15469,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "ゲート等" @@ -14362,5 +15475,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "車止め杭" @@ -14368,5 +15481,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "bollardの編集" @@ -14411,16 +15524,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 "自転車止め" @@ -14429,5 +15542,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "ブロック" @@ -14436,5 +15549,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Cattle Grid(家畜用格子柵)" @@ -14442,5 +15555,5 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Cattle Gridの編集" @@ -14448,5 +15561,5 @@ # http://en.wikipedia.org/wiki/Bus_trap #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "バスだけが通行可能になる落とし穴" @@ -14454,15 +15567,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 "料金所" @@ -14470,5 +15583,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "料金所の編集" @@ -14476,10 +15589,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 "国境検査所の編集" @@ -14489,5 +15602,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "生け垣" @@ -14496,5 +15609,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "フェンス" @@ -14503,5 +15616,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "壁" @@ -14509,5 +15622,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "城壁" @@ -14516,5 +15629,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "擁壁" @@ -14526,15 +15639,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 "ゲート" @@ -14542,50 +15655,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 "Hampshire Gate" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Hampshire Gateの編集" #. 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 "踏み越し段" @@ -14593,25 +15706,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Stileの編集" #. 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 "城の出撃路の編集" @@ -14622,10 +15735,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 "泉" @@ -14633,5 +15746,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "泉の編集" @@ -14639,5 +15752,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "側溝" @@ -14645,10 +15758,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "川(drain)の編集" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "小川" @@ -14656,10 +15769,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 "運河" @@ -14667,10 +15780,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 "川" @@ -14680,5 +15793,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 "河川の編集" @@ -14686,15 +15799,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 "陸の編集" @@ -14702,5 +15815,5 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "水たまり、窪地" @@ -14708,10 +15821,10 @@ # 水たまりになるような土地 #. 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 "ため池" @@ -14719,15 +15832,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 "蓋のされたため池の編集" @@ -14735,5 +15848,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "川岸" @@ -14742,10 +15855,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 "湿地帯" @@ -14756,14 +15869,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 "湿地" @@ -14777,35 +15890,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 "砂浜" @@ -14813,20 +15926,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 "崖" @@ -14834,10 +15947,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 "海岸線" @@ -14845,5 +15958,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "海岸線の編集" @@ -14851,5 +15964,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "フェリー航路" @@ -14857,5 +15970,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "フェリー航路の編集" @@ -14864,16 +15977,16 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" -msgstr "ボートヤード" +msgstr "ボートヤード(陸上の船置き場)" #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" -msgstr "船着き場の編集" +msgstr "ボートヤードの編集" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "ドック" @@ -14881,5 +15994,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "ドックの編集" @@ -14887,5 +16000,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "ダム" @@ -14893,15 +16006,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 "ロックゲート" @@ -14910,5 +16023,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "堰" @@ -14916,20 +16029,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 "転回地点" @@ -14938,15 +16051,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 "桟橋" @@ -14954,10 +16067,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 "フェリーターミナル" @@ -14965,12 +16078,12 @@ #. 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 "造船台" +msgstr "スリップウェイ(進水所)" #. item @@ -14978,16 +16091,16 @@ #. 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 "造船台の編集" +msgstr "スリップウェイの編集" #. 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 "線路" @@ -14995,5 +16108,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "線路の編集" @@ -15023,8 +16136,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 "追加のタイプ" @@ -15038,35 +16151,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 "モノレール" @@ -15074,45 +16187,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 "バスレーン" @@ -15120,5 +16233,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "バス車線の編集" @@ -15127,14 +16240,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 "廃棄された線路" @@ -15143,5 +16256,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "踏切" @@ -15150,5 +16263,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "踏切（遮断機なし）" @@ -15158,5 +16271,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "踏切のタイプ" @@ -15164,5 +16277,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "転車台（ターンテーブル）" @@ -15171,10 +16284,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 "いすリフト" @@ -15182,10 +16295,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 "Tバーリフト" @@ -15193,10 +16306,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Tバーリフト" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "ケーブルカー" @@ -15204,10 +16317,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 "" @@ -15215,5 +16328,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15221,5 +16334,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 "駅" @@ -15230,10 +16343,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 "ガソリンスタンド" @@ -15243,9 +16356,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" @@ -15265,106 +16607,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 "自転車レンタルの編集" @@ -15373,15 +16750,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-Reference" @@ -15389,5 +16766,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "停車場" @@ -15395,5 +16772,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "停止線の編集" @@ -15401,5 +16778,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "トラム停車場" @@ -15408,5 +16785,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "トラム停車場の編集" @@ -15414,5 +16791,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "鉄道のプラットホーム" @@ -15421,5 +16798,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "鉄道のプラットホームの編集" @@ -15431,5 +16808,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 "リファレンス (ホームの番号)" @@ -15437,10 +16814,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 "地下鉄の入口" @@ -15449,10 +16826,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 "車いす" @@ -15461,5 +16838,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "バスターミナル" @@ -15468,5 +16845,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "バスターミナルの編集" @@ -15474,5 +16851,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "バス停" @@ -15482,5 +16859,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 "バス停の編集" @@ -15489,8 +16866,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 "避難所" @@ -15498,10 +16873,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 "バス乗り場の編集" @@ -15509,5 +16884,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "タクシー" @@ -15515,5 +16890,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "タクシー乗り場の編集" @@ -15521,5 +16896,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "空港" @@ -15527,15 +16902,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15544,5 +16919,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "宿泊施設" @@ -15554,5 +16929,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "ホテル" @@ -15561,15 +16936,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 "モーテル" @@ -15577,20 +16952,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 "シャレー風の別荘、シャレー" @@ -15598,10 +16973,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 "ホステル" @@ -15609,30 +16984,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 "キャンプ場" @@ -15640,10 +17015,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 "飲食店" @@ -15654,5 +17029,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "レストラン" @@ -15660,5 +17035,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "レストランの編集" @@ -15666,5 +17041,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 "料理の種類" @@ -15672,61 +17047,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 "ファーストフード" @@ -15734,9 +17109,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 "カフェ" @@ -15744,10 +17119,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 "パブ、居酒屋" @@ -15755,20 +17129,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 "バー" @@ -15776,10 +17148,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 "ナイトクラブ" @@ -15787,33 +17158,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 "博物館" @@ -15821,10 +17183,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 "動物園" @@ -15833,10 +17194,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 "観覧台" @@ -15844,25 +17204,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "View pointの編集" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Look-Out Tower" #. 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 "美術館" @@ -15870,5 +17229,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "美術館の編集" @@ -15876,86 +17235,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 "市区" + +#: 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 "board" - -#: 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 "シェルターの編集" @@ -15963,25 +17447,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 "城" @@ -15990,20 +17474,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 "遺跡(ruins)の編集" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "遺跡（群）" @@ -16012,10 +17495,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 "戦場" @@ -16023,5 +17505,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "戦場の編集" @@ -16029,15 +17511,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 "記念碑(戦争記念などの)" @@ -16045,45 +17527,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 +msgstr "遊泳用プール" + +#. item +#: build/trans_presets.java:1851 msgid "Edit Water Park" -msgstr "親水公園の編集" +msgstr "遊泳用プールの編集" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "遊び場" @@ -16091,15 +17573,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 "つりの編集" @@ -16107,15 +17589,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 "スタジアムの編集" @@ -16129,6 +17611,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 "スポーツ選択：" @@ -16520,30 +18002,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 "スポーツ" @@ -16553,227 +18035,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 "Multiの編集" @@ -16812,248 +18292,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 "テンピンズ" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "テンピンズの編集" -#: 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 "射撃" @@ -17061,127 +18533,127 @@ #. 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 "ペロタ" @@ -17189,51 +18661,51 @@ # ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》. #. 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 "ビル" @@ -17241,5 +18713,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "公共のビル" @@ -17247,10 +18719,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 "役場" @@ -17258,10 +18730,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 "大使館" @@ -17269,10 +18741,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 "裁判所" @@ -17281,10 +18753,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 "刑務所" @@ -17293,10 +18765,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 "警察" @@ -17306,10 +18778,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 "消防署" @@ -17318,10 +18790,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 "郵便局" @@ -17329,5 +18801,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "郵便局の編集" @@ -17335,15 +18807,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 "学校" @@ -17351,10 +18823,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 "大学" @@ -17362,10 +18834,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 "短大" @@ -17373,5 +18845,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "短大の編集" @@ -17379,5 +18851,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "映画館" @@ -17386,10 +18858,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 "図書館" @@ -17398,10 +18870,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 "美術館" @@ -17409,10 +18880,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 "劇場" @@ -17421,10 +18892,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 "礼拝所" @@ -17434,5 +18905,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 "礼拝所の編集" @@ -17441,6 +18912,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 "宗教" @@ -17449,66 +18920,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 "宗派" @@ -17517,81 +18988,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 "住所" @@ -17600,5 +19071,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "住所情報の編集" @@ -17606,5 +19077,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "いえ番号" @@ -17612,20 +19083,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 "国コード" @@ -17633,5 +19104,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "住所の補間" @@ -17640,5 +19111,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "住所の補間を編集" @@ -17646,71 +19117,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 "灯台" @@ -17718,10 +19185,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 "風車" @@ -17729,10 +19196,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 "パイプライン" @@ -17740,10 +19207,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 "下水処理場" @@ -17753,10 +19220,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 "クレーン" @@ -17764,10 +19231,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 "ビーコン" @@ -17775,10 +19242,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 "調査ポイント" @@ -17786,10 +19253,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 "監視カメラ" @@ -17797,5 +19264,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "監視カメラの編集" @@ -17803,5 +19270,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "発電機" @@ -17811,39 +19278,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 "変電所" @@ -17852,10 +19319,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 "発電サブステーション" @@ -17864,5 +19331,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "配電所の編集" @@ -17870,10 +19337,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 "送電塔" @@ -17884,5 +19351,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 "送電塔の編集" @@ -17890,5 +19357,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "送電線" @@ -17897,46 +19364,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 "電話" @@ -17945,5 +19406,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "電話を編集" @@ -17951,5 +19412,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 "コイン" @@ -17957,5 +19418,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 "備考" @@ -17963,5 +19424,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 "電子マネー" @@ -17969,5 +19430,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 "デビットカード" @@ -17975,15 +19436,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 "リサイクル" @@ -17992,5 +19453,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "リサイクルステーションの編集" @@ -17998,80 +19459,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 "Hunting Stand" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Hunting Standの編集" -#. 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 "噴水" @@ -18080,10 +19537,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 "飲料水" @@ -18092,10 +19549,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 "赤ちゃんポスト" @@ -18103,25 +19560,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 "コンビニエンスストア" @@ -18129,10 +19596,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 "キオスク" @@ -18140,10 +19606,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 "自動販売機" @@ -18151,5 +19636,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "自動販売機の編集" @@ -18157,88 +19642,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 "携帯の契約" -#: 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 "精肉店" @@ -18246,10 +19731,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 "パン屋" @@ -18257,10 +19741,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 "生花店" @@ -18268,20 +19751,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 "" @@ -18289,60 +19770,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 "園芸用品店" @@ -18350,10 +19825,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 "金物屋" @@ -18361,10 +19835,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 "DIYショップ" @@ -18372,60 +19845,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "DIYショップの編集" -#. 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 "クリーニング店" @@ -18433,10 +19900,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 "ランドリー" @@ -18444,10 +19910,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 "アウトドア店" @@ -18455,35 +19920,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 "銀行" @@ -18491,16 +19953,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 "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "両替" @@ -18508,5 +19968,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "両替の編集" @@ -18514,15 +19974,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "ATMの編集" #. 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 "医院" @@ -18530,20 +19990,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 "薬局" @@ -18551,5 +20009,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "薬局の編集" @@ -18557,10 +20015,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 "病院" @@ -18568,10 +20025,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 "夜間急病センター" @@ -18580,5 +20037,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "夜間急病センターの編集" @@ -18587,20 +20044,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 "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)" @@ -18608,5 +20065,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 "動物病院" @@ -18615,55 +20072,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 "国(country)" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "国(country)の編集" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "州(state)" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "州(state)の編集" #. 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 "郡の編集" @@ -18671,15 +20128,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "市区" #. 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 "町" @@ -18687,10 +20144,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 "近郊住宅地" @@ -18698,25 +20155,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 "小村落の編集" @@ -18724,5 +20181,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "地域" @@ -18730,10 +20187,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 "島" @@ -18741,11 +20198,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 "洞窟の入口" @@ -18753,10 +20223,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 "山頂" @@ -18764,10 +20234,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 "氷河" @@ -18775,10 +20245,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 "火山" @@ -18786,70 +20256,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 "Civil境界" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Civil境界の編集" #. 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 "Political境界の編集" #. 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 "樹木・林" @@ -18858,15 +20328,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 "森" @@ -18875,5 +20345,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "森の編集" @@ -18881,17 +20351,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 "森" @@ -18900,14 +20370,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 "自然保護区の編集" @@ -18915,25 +20385,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 "山(Fell)" @@ -18941,10 +20411,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "山(Fell)の編集" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "荒れ地" @@ -18952,5 +20422,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "荒れ地の編集" @@ -18958,5 +20428,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "農家の庭" @@ -18965,45 +20435,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 "家庭菜園用地の編集" @@ -19011,25 +20481,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 "里山" @@ -19037,10 +20507,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 "共有地" @@ -19048,20 +20518,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 "レクレーション広場" @@ -19069,5 +20539,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "レクレーション広場利用区画の編集" @@ -19075,15 +20545,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 "墓所" @@ -19091,9 +20561,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 "共同墓地" @@ -19101,39 +20571,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 "鉄道用地" @@ -19141,15 +20611,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 "軍用地の編集" @@ -19157,55 +20627,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 "マルチポリゴン" @@ -19215,5 +20685,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 "マルチポリゴンを編集" @@ -19222,10 +20692,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 "内側のセグメント" @@ -19233,5 +20703,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "右左折制限" @@ -19240,5 +20710,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "右左折制限の編集" @@ -19246,34 +20716,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 "Uターン禁止" -#: 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 "直進のみ" @@ -19282,15 +20752,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 "ウエイへ" @@ -19298,5 +20768,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "ルート" @@ -19305,5 +20775,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "ルート編集" @@ -19311,5 +20781,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "ルート種類" @@ -19381,5 +20851,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 @@ -19388,17 +20858,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 "スキー" @@ -19451,5 +20921,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 @@ -19458,13 +20928,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 "迂回路" @@ -19478,10 +20948,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 "シンボルの説明" @@ -19489,31 +20959,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 "色 (16進法)" @@ -19522,30 +20992,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 "後方の停止点" @@ -19983,11 +21453,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 "破棄された" @@ -20313,41 +21783,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 @@ -22048,5 +23481,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 "信号_水域" @@ -22645,55 +24078,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22707,5 +24091,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 "旅行関係" @@ -22777,8 +24161,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 "史跡" @@ -22849,8 +24233,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 "緑" @@ -22864,5 +24248,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "石切り場" @@ -22876,5 +24260,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "埋め立て地" @@ -22896,5 +24280,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "水たまり、窪地" @@ -22908,5 +24292,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "森" @@ -22920,5 +24304,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "農地" @@ -22941,5 +24325,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "小売りの商用地" @@ -22953,5 +24337,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "工業地" @@ -22965,5 +24349,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "使用していない工業地" @@ -22977,5 +24361,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "緑地" @@ -22989,5 +24373,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "鉄道公園" @@ -23044,7 +24428,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 "軍用地" @@ -23058,5 +24442,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "墓地" @@ -23069,5 +24453,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "山頂" @@ -23082,5 +24466,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "氷河" @@ -23094,5 +24478,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "火山" @@ -23147,8 +24531,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 "自然" @@ -23162,5 +24546,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "低木" @@ -23174,20 +24558,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 @@ -23198,5 +24570,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "泥" @@ -23210,5 +24582,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "砂浜" @@ -23286,8 +24658,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 "ルート" @@ -23335,7 +24707,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 "行政区境" @@ -23477,10 +24849,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 "場所" @@ -23528,6 +24909,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 "住所" @@ -23824,6 +25205,63 @@ msgstr "" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Tableau d'Assemblageを選択" +#~ 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 "" +#~ "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 "Cannot open preferences directory: {0}" +#~ msgstr "情報ディレクトリを読み取れません: {0}" + +#~ msgid "Delete Layer" +#~ msgstr "レイヤー削除" + +#~ msgid "Authors: {0}" +#~ msgstr "作者: {0}" + +#~ msgid "Public" +#~ msgstr "公開" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" + +#~ msgid "Continue anyway" +#~ msgstr "とりあえず続ける" + +#~ msgid "Edit Information Office" +#~ msgstr "案内所の編集" + +#~ msgid "Map Type" +#~ msgstr "マップタイプ" + +#~ msgid "map" +#~ msgstr "マップ" + +#~ msgid "citymap" +#~ msgstr "街路地図" + +#~ msgid "hikingmap" +#~ msgstr "ハイキングマップ" + +#~ msgid "bicyclemap" +#~ msgstr "自転車マップ" + +#~ msgid "board" +#~ msgstr "board" #~ msgid "Move" @@ -23948,4 +25386,7 @@ #~ msgstr "終了" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Tableau d'Assemblageを選択" + #~ msgid "Navigation" #~ msgstr "ナビゲーション" @@ -24025,7 +25466,4 @@ #~ msgid "Add Selected" #~ msgstr "選択したものを追加" - -#~ msgid "Not implemented yet." -#~ msgstr "まだ実装されていません。" #~ msgid "Remove Selected" @@ -24101,7 +25539,4 @@ #~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" #~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "{1}個のオブジェクト中の{0}個の競合を解決" #~ msgid "{0} object has conflicts:" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 17484) +++ /applications/editors/josm/i18n/po/nb.po (revision 17485) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" "PO-Revision-Date: 2009-08-15 13:39+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Bygger opp hovedskjermbilde" #. 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 "Hjelp" -#: ../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 "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon." -#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Feil" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren." - -#: ../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] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" +msgstr[1] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Ulagrede endringer" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" - -#: ../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 "Lagre og avslutt" -#: ../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 "Forkast og avslutt" -#: ../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 "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: «{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 "Advarsel" -#: ../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 "Overser feilutformet fil-URL: «{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Programtillegg" @@ -342,17 +352,26 @@ #: ../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 "" "Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " "riktig til historikkside for OSM-element. API-URL er «{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 "" +"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " +"riktig til historikkside for OSM-element. API-URL er «{0}»." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Velg minst én allerede opplastet node, linje eller relasjon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -362,5 +381,5 @@ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" -#: ../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 "" @@ -370,11 +389,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Flett" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -383,5 +402,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 "" @@ -398,11 +417,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 @@ -431,5 +450,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 "Breddegrad" @@ -438,30 +457,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 "Lengdegrad" +#: ../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 "Juster nodene til en sirkel" -#: ../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 "Flytt de valgte nodene i en sirkel." -#: ../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 @@ -475,6 +494,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 @@ -482,58 +501,57 @@ msgstr "Verktøy: {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 "Velg minst fire noder." #. 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 "Informasjon" #. 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 "Juster nodene til en linje" -#: ../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 "Flytt valgte noder til en rett linje." -#: ../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 "Velg minst 3 noder" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -544,10 +562,10 @@ "er {0}, maksimalt er {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-krav ikke møtt" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -557,5 +575,5 @@ "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -566,46 +584,46 @@ "lengde {2}. Verdiens lengde er {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Forhåndsbetingelse brutt" -#: ../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} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "utvalg" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "last ned" +#: ../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 "Gå til {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 "Skaler og flytt skjermbildet til {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 @@ -615,22 +633,22 @@ msgstr "Bilde: {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 "Inet utvalg å vise." -#: ../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 "Ingen konflikter å vise." +#: ../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 "Sammenføy linjer" -#: ../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 "Sammenføy flere linjer til én" -#: ../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 "Velg minst to linjer å sammenføye." @@ -641,4 +659,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Sammenføy uansett" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -646,19 +668,7 @@ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Sammenføy uansett" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Endre retninger?" - -#: ../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 "" -"Linjene har forskjellig retning og kan ikke sammenføyes. Vil du snu " -"retningen på noen av linjene?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -666,27 +676,34 @@ msgstr "Snu og sammenføy" -#: ../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 "" +"Linjene har forskjellig retning og kan ikke sammenføyes. Vil du snu " +"retningen på noen av linjene?" + +#: ../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 "Legg inn verdier for alle konflikter." -#: ../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 "Løs konflikter" -#: ../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 "Sammenføy {0} linjer" -#: ../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 "Alle linjene var tomme" -#: ../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 " @@ -694,32 +711,32 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" +#: ../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 "Kopier" -#: ../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 "Kopier valgte objekter til utklippstavla." -#: ../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 "Velg noe å kopiere." +#: ../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 "Lag en sirkel" -#: ../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 "Lag en sirkel fra tre valgte noder." -#: ../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 "Disse nodene er ikke i en sirkel. Avbryter." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -731,20 +748,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 "Slett" @@ -754,85 +771,86 @@ msgstr "Slett valgte objekter." -#: ../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 "Skriv over" -#: ../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 "Filen finnes. Vil du overskrive filen?" #. 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 "Jevn fordeling av noder" -#: ../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 "Fordel valgte noder med lik avstand etter en linje." +#: ../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 "Last ned fra 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 "Last ned kartdata fra OSM-tjeneren." -#: ../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 "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Last ned" -#: ../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 "Velg minst én oppgave å laste ned" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "Last ned referansene ..." -#: ../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 "Det oppstod {0} konflikter under import." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -841,6 +859,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 "Fordoble" @@ -864,85 +882,91 @@ msgstr "Avslutt programmet." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Alle bilder" + +#: ../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 "Eksporter til 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 "Eksporter dataene til GPX-fil." -#: ../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 "Ingenting å eksportere. Hent inn data først." -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Eksporter GPX fil" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM hjelpesider" -#: ../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 "Åpne i nettleser" -#: ../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 "Endre" -#: ../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 "Last inn på nytt" -#: ../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 "Du kan bare redigere hjelpesider fra 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 "Feil ved nedlasting av {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." msgstr "Hjelpeside mangler. Opprett den på engelsk." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -996,22 +1020,26 @@ msgstr "Flett det gjeldende laget inn i et annet lag" +#: ../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 "Samle noder" -#: ../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 "Samle noder i den eldste" -#: ../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 "Velg minst to noder til å samle" -#: ../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 "Samle noder med forskjellige relasjoner?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Samle noder allikevel" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1021,77 +1049,73 @@ "samle noder?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Samle noder allikevel" - -#: ../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 "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk." -#: ../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 "Samle {0} noder" +#: ../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 "Flett utvalgte" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Speilvend" -#: ../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 "Speilvend valgte noder og linjer" -#: ../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 "Velg minst én node eller linje." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "opp" -#: ../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 "Flytt objektene {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "venstre" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "høyre" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Flytt {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 "Flytter Objekter {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 "Kan ikke flytte objekter utenfor kartet." @@ -1099,5 +1123,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 "Ny" @@ -1107,17 +1131,22 @@ msgstr "Lag et nytt kart." -#: ../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 "Åpne …" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Åpne en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Åpne en fil." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Ukjent rolle «{0}»." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1155,21 +1184,17 @@ msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Bare to noder tillatt" -#: ../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 "Du kan bare velge linjer." -#: ../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 "Velg en eller flere lukkede linjer med minst fire noder." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." - -#: ../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 " @@ -1178,9 +1203,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 "Bare én node er valgt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Vinkle (90)" @@ -1196,13 +1221,26 @@ msgstr "Lim inn fra utklippstavla." -#: ../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 "Lim inn egenskaper" -#: ../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 "Bruk egenskaper i utklippstavla på alle valgte element." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Laster {0}" +msgstr[1] "Laster {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Gjenopprett {0} objekter" +msgstr[1] "Gjenopprett {0} objekter" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1228,37 +1266,32 @@ msgstr "Gjør om siste angrede handling." -#: ../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 "Endre navn på lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Gi nytt navn på fil også" -#: ../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 "" +#: ../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 "Snu retning på linjer" -#: ../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 "Snu retning på alle valgte linjer" -#: ../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 "Velg minst én linje" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Snu retning på linjer" @@ -1266,10 +1299,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 "Lagre" #: ../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 "Lagre gjeldende data." @@ -1280,36 +1314,25 @@ msgstr "Filen {0} finnes allerede. Vil du skrive over den?" -#: ../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 "" -"Feilmelding: cannot check conditions for no layer. Send inn en feilmelding." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Ingen åpne dokument å lagre" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Tomt dokument" -#: ../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 "Dokumentet er tomt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Lagre uansett" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikter" -#: ../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 " @@ -1319,28 +1342,28 @@ "du fortsette?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Avvis konflikter og lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Lagre OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Lagre GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Lagre lag" +#: ../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 "Lagre som …" -#: ../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 "Lagre aktive data i ny fil." @@ -1372,33 +1395,33 @@ msgstr "Hjelp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Statusrapport" -#: ../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 "Kopier til utklippstavlen og lukk" -#: ../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 "Lukk" +#: ../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 "Splitt linje" -#: ../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 "Splitt en linje i den valgte noden." -#: ../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 "Kan ikke splitte med dette utvalget" -#: ../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." @@ -1406,5 +1429,5 @@ msgstr[1] "Valgte noder er ikke del av en linje." -#: ../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 " @@ -1416,9 +1439,9 @@ msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer." -#: ../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 "Valgte noder er ikke på samme linje." -#: ../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." @@ -1426,10 +1449,10 @@ msgstr[1] "Valgt linje inneholder ikke de valgte nodene." -#: ../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 "Velg to eller fler noder for å splitte sirkelformet linje." -#: ../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 " @@ -1439,5 +1462,5 @@ "linjen.)" -#: ../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 " @@ -1445,5 +1468,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 " @@ -1451,8 +1474,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 "Splitt linje {0} i {1} deler" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Lukker endringssett …" + +#: ../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 "Lukker endringssett …" + +#: ../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 "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Lukker endringssett …" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1470,57 +1518,57 @@ msgstr "Slår av/på global innstilling «{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 "Fjern knytning til linjer" -#: ../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 "Dupliser noder som er med i flere linjer." -#: ../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 "Denne noden har ikke knytninger" -#: ../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 "Ingen av disse nodene har knytninger." -#: ../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 "Ingen noder i denne linjen har andre knytninger." -#: ../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 "Valgte element har ikke knytninger som kan løses." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Velg:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../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 "– En node som brukes av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "– En node som er brukt av flere linjer, og en av linjene, eller" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" + #: ../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 "" -"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer." -#: ../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" @@ -1533,9 +1581,9 @@ "kopier og alle noder bli valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../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" @@ -1543,5 +1591,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" @@ -1585,61 +1633,71 @@ msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)" -#: ../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 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Oppdater utvalg" -#: ../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 "Oppdaterer de valgte objektene fra tjeneren" -#: ../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 "Det er ingen valgte objekter å oppdatere" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Utvalget er tomt" -#: ../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 "Last opp til 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 "Last opp alle endringer til OSM-tjeneren." -#: ../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 "Data inneholder uløste konflikter som først må løses." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Ingen endringer å laste opp. Finn frem data først." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Data inneholder uløste konflikter som først må løses." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Ingen endringer å laste opp." -#: ../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 "Synkroniser kun {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 "Synkroniser hele datasettet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1660,17 +1718,17 @@ "strong> for å gå tilbake og fortsette å redigere.
" -#: ../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 "Konflikt oppdaget" #. 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 "Uventet returverdi. Mottok {0}." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1685,32 +1743,70 @@ "strong> for å avbryte operasjonen og fortsette å redigere.
" -#: ../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}\"" msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#: ../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 "Feillinje «{0}» samsvarer ikke med forventet mønster «{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 "Opplasting feilet.
{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 "Klarte ikke laste opp til OSM-API" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Oppdaterer objekt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Laste opp disse endringene?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Last opp endringer" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Rediger ny relasjon i lag \"{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 "Legg til en node i eksisterende linje" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1718,31 +1814,80 @@ 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 "Gi en kort kommentar for endringene du laster opp:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Innstillinger for kart" + +#: ../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 "endringssett" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objekter som legges til:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objekter som endres:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objekter som slettes:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Gi en kort kommentar for endringene du laster opp:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Laste opp disse endringene?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Last opp endringer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Laster opp" +#: ../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] "Objekter som legges til:" +msgstr[1] "Objekter som legges til:" + +#: ../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] "Objekter som endres:" +msgstr[1] "Objekter som endres:" + +#: ../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] "Objekter som slettes:" +msgstr[1] "Objekter som slettes:" + +#: ../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 "Siste endring på {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1766,20 +1911,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 "Audio: {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 "Raskere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Rask Avspilling" @@ -1821,10 +1966,10 @@ msgstr "Spill av forrige merke" -#: ../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 "Saktere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Spill av sakte" @@ -1852,31 +1997,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 "Ingenting er importert." -#: ../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-data" -#: ../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 "Last ned {0} av {1} ({2} gjenstår)" -#: ../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 "Feil under nedlasting" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1893,20 +2034,20 @@ "{2} for å ignorere.
" -#: ../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 "Slettede eller flyttede objekter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Slettemodus" -#: ../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 "Slett noder eller linjer." -#: ../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 @@ -1915,5 +2056,5 @@ msgstr "Modus: {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 " @@ -1923,55 +2064,69 @@ "når linjer slettes. Ctrl: slett objekt med referanse." -#: ../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 "parameter «{0}» må ha en verdi" +#: ../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 "Tegn" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Tegn noder" -#: ../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 "Modus: Tegne Fokus" -#: ../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 @@ -1979,38 +2134,38 @@ msgstr "valgt" -#: ../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 "Kan ikke legge til node utenfor kartet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Legg til node" -#: ../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 "Legg til node i linje" -#: ../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 "Knytt eksisterende linje til node" -#: ../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 "Legg til en node i eksisterende linje" -#: ../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 "Legg til node i linje og lag tilknytning" -#: ../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 "Lag ny node." -#: ../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 "Veg node under pekeren." -#: ../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." @@ -2019,14 +2174,14 @@ msgstr[1] "Sett inn ny node i {0} linjer." -#: ../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 "Start ny linje fra siste node." -#: ../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 "Fortsett samme linje fra siste node." -#: ../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 "Avslutt tegning." @@ -2046,5 +2201,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 "Slipp museknappen for å velge objektene i rektangelet." @@ -2055,5 +2210,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 "Slipp museknappen for å avslutte rotasjon." @@ -2071,17 +2226,18 @@ "+slipp synkroniserer audio i dette punktet." +#: ../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 "Velg" -#: ../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 "Velg, flytt og roter objekt" -#: ../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" @@ -2090,13 +2246,21 @@ msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flytt elementer" -#: ../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 "Flytt dem" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Angre flytting" + +#: ../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 "" @@ -2104,13 +2268,9 @@ "ofte en feil." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Flytt dem" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Angre flytting" - -#: ../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." @@ -2119,5 +2279,5 @@ "nærmeste node." -#: ../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-" @@ -2145,60 +2305,60 @@ "piltaster; flytt utsnitt med høyre museknapp" +#: ../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 "Søk …" -#: ../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 "Søk etter objekt." -#: ../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 "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "erstatt utvalg" -#: ../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 "legg til i utvalg" -#: ../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 "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regulært uttrykk" -#: ../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 "Nansens gate – «Nansens» og «gate» i nøkkel eller navn." -#: ../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 "\"Nansens gate\" – «Nansens gate» i nøkkel eller navn." -#: ../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:Nan – «Nan» finnes innen navnet." -#: ../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 – nøkkel «type» med eksakt verdi «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, " @@ -2208,66 +2368,67 @@ "*=value, 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:Nan – «Nan» finnes ikke innen navnet." -#: ../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: – nøkkel «foot» med hvilken som helst verdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../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: – type objekt (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:… – alle objekter redigert av angitt bruker" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:… – objekt med angitt ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:… – objekt med angitt ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:… – objekt med angitt antall noder" -#: ../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 – alle endrede objekter" -#: ../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 – alle objekter i utvalg" -#: ../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 – alle uferdige objekter" -#: ../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 "untagged – alle objekter uten egenskaper" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child uttrykk – alle underobjekter av objektene i uttrykket" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child uttrykk – alle underobjekter av objektene i uttrykket" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent uttrykk – alle overobjekter av objektene i uttrykket" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent uttrykk – alle overobjekter av objektene i uttrykket" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Bruk | eller OR for søk med logisk eller" -#: ../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 "" @@ -2275,46 +2436,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 "Bruk ( og ) for å gruppere uttrykk" -#: ../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 "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Start søk" -#: ../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 "Fant ingen treff for «{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 "Ingenting lagt til utvalg ved søk etter «{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 "Ingenting fjernet fra utvalg ved søk etter «{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 "Fant {0} treff" -#: ../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" @@ -2381,58 +2542,96 @@ msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Les inn utvalg" -#: ../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 "Koble til {0} …" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Laster ned …" -#: ../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 "Klarte ikke lese fra URL: «{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 "Feil i URL: «{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 "Feil ved tjenerkommunikasjon." -#: ../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 "Legg til node" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Legg til {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 "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Endre {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 "Endre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Skift relasjon" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Fjern «{0}» i {1} «{2}»" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Fjern «{0}» i {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 "Fjern «{0}» i {1} «{2}»" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Sett {0}={1} i {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 "Sett {0}={1} i {2} «{3}»" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Sett {0}={1} i {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" @@ -2441,10 +2640,10 @@ msgstr[1] "objekter" -#: ../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 "Fjern «{0}» i {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}" @@ -2456,5 +2655,5 @@ msgstr "Endre rolle for relasjonsmedlem {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2463,10 +2662,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2475,5 +2674,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}''" @@ -2499,44 +2698,60 @@ msgstr "kan ikke løse uavgjort konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slett {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slett {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] "Slett {0} {1}" +msgstr[1] "Slett {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] "Slettemodus" +msgstr[1] "Slettemodus" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Slett {0} {1}" +msgstr[1] "Slett {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] "Slett fra relasjon" +msgstr[1] "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relasjonen har konflikter" -#: ../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 "Slett fra relasjon" + +#: ../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 "" "Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n" "Vil du slette utvalget fra relasjonen?" -#: ../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 "Slett fra relasjon" - -#: ../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 "" "Utvalg «{0}» brukes av relasjon «{1}».\n" "Vil du slette utvalget fra relasjonen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Splitt linje i segment" @@ -2544,6 +2759,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." @@ -2555,5 +2770,5 @@ "nå) .
Er du sikker på at du vil slette nodene?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2564,5 +2779,5 @@ msgstr "Løs slettekonflikt i {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" @@ -2599,10 +2814,20 @@ msgstr "Løs medlemskonflikter i relasjon {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Fjern relasjonsmedlem {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" @@ -2615,17 +2840,37 @@ msgstr "Sekvens" -#: ../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 "Løs {0} egenskapskonflikter i {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 "Løs {0} egenskapskonflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Løs {0} egenskapskonflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Gjenopprett {0} objekter" -#: ../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 "Løs versjonskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Løs versjonskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Løs versjonskonflikter for {0} {1}" @@ -2652,13 +2897,13 @@ "opprettholde dataintegritet." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relasjon" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Tidligere rolle" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Ny rolle" @@ -2677,62 +2922,121 @@ #: ../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 "Ny verdi" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Bruk valgte endringer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Ikke bruk endringer" -#: ../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 "Velg hvilke endringer som skal brukes." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Egenskaper for " -#: ../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 "Roller i relasjoner som viser til" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Korriger egenskap automatisk" -#: ../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 "Innstillingsfil har feil i linje {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åpne innstillingsmappe: {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 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" +"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i " +"historikken." + +#: ../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 "Feil i innstillingsfila. Lagrer sikkerhetskopi i {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 "Innstillinger lagret i {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 "Kunne ikke laste opp innstillinger. Årsak: {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 "Klarte ikke lese innstillinger fra tjener." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2746,29 +3050,36 @@ msgstr "allerede registrert en konflikt for primitiv \"{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 "Desimalgrader" -#: ../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 "Grader, minutter, sekunder" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "V" -#: ../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}" @@ -2780,15 +3091,232 @@ msgstr "parameter {0} > 0 nødvendig. Leste {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 "uferdig" - -#: ../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 "Feil: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Advarsel: {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 "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{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 "Denne historikken har ikke noe element med versjon {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 "Denne historikken har ikke noen gyldig versjon for dato «{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 "parameter «{0}» i intervall 0–{1} forventet – leste {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "Fant ingen første versjon. Historikken er tom." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "Fant ingen siste versjon. Historikken er tom." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" + +#: ../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 "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet" + +#: ../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 "parameter «{0}» > 0 forventet – leste «{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 "klarte ikke sammenlikne element med ID «{0}» og element med 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 "parameter {0} er ikke i intervall 0–{1} – leste {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Linje for areal er ikke lukket." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "multipolygon-linje «{0}» er ikke lukket." + +#. 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 "Tomt medlem i relasjon." + +#: ../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 "Slettet medlem «{0}» i relasjon." + +#: ../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 "Linje «{0}» med færre enn to punkter." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Fant mer enn én linje med «from»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Fant mer enn én linje med «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 "Fant mer enn én \"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 "Ukjent rolle «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Ukjent medlemstype for «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Fant ingen linje med «from»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Fant ingen linje med «to»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Fant ingen node eller linje med «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 "Linje med «from» har ikke start eller slutt i en «via»-node." + +#: ../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 "Linje med \"to\" har ikke start eller slutt i \"via\"-node." + +#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-linje." + +#: ../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 "linje med «to» har ikke start eller slutt i en «via»-linje." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Fant ikke stil for restriksjon {0}." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Multipolygon-medlem «{0}» er ikke en linje." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Ingen ytre linje for multipolygon «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Skjæring mellom linjene «{0}» og «{1}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Indre linje «{0}» er utenfor." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Stil for indre linje «{0}» er samme som multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Stil for ytre linje «{0}» passer ikke." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "Uten egenskaper" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "tekst" + +#. 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 "" +"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element " +"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne " +"selvmotsigelsen. Beholder lokalt element. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inaktiv" + #: ../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" @@ -2797,22 +3325,7 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Feil: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Advarsel: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "noder" - -#: ../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" @@ -2821,12 +3334,7 @@ msgstr[1] "linjer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "linjer" - -#: ../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" @@ -2835,249 +3343,4 @@ msgstr[1] "relasjoner" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relasjoner" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "endringssett" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "endringssett" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} medlem" -msgstr[1] "{0} medlemmer" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "ferdselsvei" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "jernbane" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vannvei" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "bruk av grunn" - -#: ../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} node" -msgstr[1] "{0} noder" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Denne historikken har ikke noe element med versjon {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 "Denne historikken har ikke noen gyldig versjon for dato «{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 "parameter «{0}» i intervall 0–{1} forventet – leste {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "Fant ingen første versjon. Historikken er tom." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "Fant ingen siste versjon. Historikken er tom." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" - -#: ../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 "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet" - -#: ../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 "parameter «{0}» > 0 forventet – leste «{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 "klarte ikke sammenlikne element med ID «{0}» og element med 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 "parameter {0} er ikke i intervall 0–{1} – leste {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Linje for areal er ikke lukket." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "multipolygon-linje «{0}» er ikke lukket." - -#. 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 "Tomt medlem i relasjon." - -#: ../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 "Slettet medlem «{0}» i relasjon." - -#: ../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 "Linje «{0}» med færre enn to punkter." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Fant mer enn én linje med «from»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Fant mer enn én linje med «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 "Fant mer enn én \"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 "Ukjent rolle «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Ukjent medlemstype for «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Fant ingen linje med «from»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Fant ingen linje med «to»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Fant ingen node eller linje med «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 "Linje med «from» har ikke start eller slutt i en «via»-node." - -#: ../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 "Linje med \"to\" har ikke start eller slutt i \"via\"-node." - -#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-linje." - -#: ../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 "linje med «to» har ikke start eller slutt i en «via»-linje." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Fant ikke stil for restriksjon {0}." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Multipolygon-medlem «{0}» er ikke en linje." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Ingen ytre linje for multipolygon «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Skjæring mellom linjene «{0}» og «{1}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Indre linje «{0}» er utenfor." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Stil for indre linje «{0}» er samme som multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Stil for ytre linje «{0}» passer ikke." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "Uten egenskaper" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "tekst" - -#. 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 "" -"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element " -"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne " -"selvmotsigelsen. Beholder lokalt element. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inaktiv" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3090,5 +3353,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "bakgrunn" @@ -3098,5 +3361,5 @@ msgstr "fremhevet" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3106,5 +3369,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3120,21 +3383,21 @@ "og start et nytt lag i en annen sone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert-sone (Frankrike)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert-sone (Estland)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Swiss Grid (Sveits)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3155,8 +3418,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3164,17 +3427,103 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Ikke vis igjen" -#: ../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/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 "uferdig" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "ferdselsvei" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "jernbane" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vannvei" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "bruk av grunn" + +#: ../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} node" +msgstr[1] "{0} noder" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} medlem" +msgstr[1] "{0} medlemmer" + +#: ../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 "" "Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n" "Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker." -#: ../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 "ukjent" + +#: ../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 "" @@ -3186,36 +3535,9 @@ "datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Forhåndsbetingelse brutt" -#: ../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 "ukjent" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3225,9 +3547,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 "" @@ -3236,9 +3558,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3247,9 +3569,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 "" @@ -3259,9 +3592,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Ukjent vert" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3274,12 +3607,7 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Objekt allerede slettet" - -#: ../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 @@ -3296,38 +3624,38 @@ msgstr "Laster ned \"Dagens melding\"" -#: ../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 "Last opp innstillinger" -#: ../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 "Last opp aktive innstillinger til tjener" -#: ../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 "streng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Brukernavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Passord hos 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 "Endre vinduets størrelse til oppgitt geometri (format: BREDDExHØYDE)" -#: ../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 "string;string;..." -#: ../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 " @@ -3337,5 +3665,5 @@ "lat=y&lon=x&zoom=z, eller filnavn" -#: ../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 " @@ -3345,5 +3673,5 @@ "lat=y&lon=x&zoom=z, eller filnavn" -#: ../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 " @@ -3353,75 +3681,94 @@ "som returnerer osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "enhver" -#: ../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 "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn." -#: ../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 "Brukernavn" -#: ../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 "Passord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "bruk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Vis hjelp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standard Unix-geometri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Last ned områdeavgrensing" -#: ../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 "Last ned området i URL (with 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 "Åpne fil (som rå gps, dersom .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 "Last ned områdeavgrensing som rå 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 "Velg med gitt søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Start maksimert" -#: ../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 "Gå tilbake til standardinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Velg språk" -#: ../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 "eksempler" -#: ../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" @@ -3431,47 +3778,47 @@ "du prøver --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 "I stedet for --download= kan du bruke 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 "Gjør opplastede programtillegg tilgjengelig" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../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." msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Fil" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Verktøy" -#: ../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 "Objektmaler" -#: ../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 @@ -3483,21 +3830,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 "Vis akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Slå av/på akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Slå av/på fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3537,58 +3884,44 @@ msgstr "Forminsk" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "målestokk" -#: ../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 "Lengdegrad ved musepekeren." -#: ../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 "Navn på objekt ved musepeker" -#: ../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 "Breddegrad ved musepekeren." -#: ../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 "Vinkel mellom forrige og nåværende linjesegment." -#: ../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 "Kompassretning på segmentet som tegnes." -#: ../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 "Lengden på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(intet objekt)" -#: ../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 "Laget er ikke i lista." -#: ../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 "" - -#: ../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 "" @@ -3600,10 +3933,4 @@ msgid "File not found" msgstr "Fant ikke fila" - -#: ../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 @@ -3663,7 +3990,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" @@ -3679,5 +4005,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" @@ -3784,5 +4110,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 "Lokal versjon" @@ -3793,5 +4119,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" @@ -3807,5 +4133,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 "Tjenerversjon" @@ -3896,6 +4222,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" @@ -4011,10 +4337,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 "Uventet kolonneindeks: {0}" -#: ../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 "" @@ -4025,19 +4351,19 @@ "" -#: ../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 "Kommunikasjon med tjener feilet" -#: ../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 "Ja, gjenopprett også dem" -#: ../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 "Nei, avbryt operasjonen" -#: ../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 "" @@ -4048,5 +4374,5 @@ "

Vil du gjenopprette også disse nodene?" -#: ../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 "Gjenopprette ytterligere noder?" @@ -4066,9 +4392,9 @@ msgstr "Gjenopprette avhengige objekter?" -#: ../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 "Egenskaper i det lokate datasettet" -#: ../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 " @@ -4078,95 +4404,97 @@ "elementer når sammenslåingsvalgene tas i bruk." -#: ../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 "Egenskaper i tjenerens datasett" -#: ../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 "Koordinater:" -#: ../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 "Slettestatus:" -#: ../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 "Synlighetsstatus:" -#: ../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 "(ingen)" -#: ../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 "slettet" -#: ../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 "ikke slettet" -#: ../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 "synlig (på tjeneren)" -#: ../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 "ikke synlig (på tjeneren)" -#: ../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 "Behold en klone av den lokale versjonen" -#: ../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 "Slett fra det lokale datasettet" -#: ../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 "Behold lokale koordinater" -#: ../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 "Behold tjenerens koordinater" -#: ../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 "Fjern avgjørelse fra koordinatkonflikt" -#: ../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 "Behold lokal slettestatus" -#: ../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 "Behold tjenerens slettestatus" -#: ../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 "Fjern avgjørelse fra slettekonflikt" -#: ../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 "Behold lokal synlighetsstatus" -#: ../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 "Ja, nullstill 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 "Nei, avbryt" -#: ../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 "" "For å beholde den lokale versjonen,
må JOSM sette ID for {0} {1} " @@ -4174,17 +4502,17 @@ "
Er dette OK?" -#: ../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 "Nullstill ID" -#: ../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 "Behold tjenerens synlighetsstatus" -#: ../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 "Ja, rydd ut objektet" -#: ../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 "" @@ -4195,21 +4523,21 @@ "OK?" -#: ../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 "Fjern fra datasett" -#: ../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 "Fjern avgjørelse fra visningskonflikt" #: ../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 "Rolle" #: ../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 "Objekt" @@ -4248,10 +4576,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 @@ -4260,10 +4589,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 @@ -4277,5 +4607,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}" @@ -4316,4 +4646,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {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 "ingen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "alle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Velg en farge" + +#: ../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 "parameter «{0}» er ikke et gyldig typenavn – leste «{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 "parameter «{0}» må ha en verdi" + +#: ../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 "parameter «{0}» i intervall 0–{1} forventet – leste {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 "ikke slettet" + +#: ../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 "Ikke implementert enda." + +#: ../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 "fra linje" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikter i data" + +#: ../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} linje" +msgstr[1] "{0} linjer" + +#: ../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} relasjon" +msgstr[1] "{0} relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Konfliktløsning" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Løs konflikter" + +#: ../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 "Lim inn" + +#: ../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} linje" +msgstr[1] "{0} linjer" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4329,10 +4796,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 @@ -4340,5 +4807,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}" @@ -4369,36 +4836,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 "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../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 "Avbryt konfliktløsning og lukk vinduet" -#: ../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 "Ta i bruk løste konflikter og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Bruk løsninger" -#: ../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 "Fortsett å løse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4410,151 +4871,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 "Løs konflikter" -#: ../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 "Historikk" -#: ../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 "Vis historikk på alle valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Klarte ikke laste historikk fra tjeneren. Detaljer:
{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 "Indeks er utenfor rekkevidde: {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 "Node {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 "Lag: {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 "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Historikkobjekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Last historikk" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Laster historikk for {0} med 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 "Les inn og oppfrisk liste over alle valgte objekt." #. 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 "Vis" -#: ../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 "Vis historikken for det valgte objektet" -#: ../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 "Lag" -#: ../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 "Liste over alle innleste lag" -#: ../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 "Slett valgt Lag." -#: ../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 "Slett Lag" - -#: ../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 "" - -#: ../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 "Vis/Skjul" -#: ../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 "Slå av/på visning av Lag" -#: ../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 "Flytt laget en rad opp." -#: ../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 "Flytt laget en rad ned." -#: ../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." @@ -4563,28 +4991,22 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../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 "Nøkkelen blir ikke lagret når den er tom." -#: ../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 "Endre verdier?" -#: ../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" @@ -4593,89 +5015,84 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../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 "Velg en nøkkel" -#: ../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 "Velg en verdi" -#: ../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 "Velg de objekter, du vil rette egenskaper for." -#: ../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 "Egenskaper/medlemsskaper" -#: ../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 "Egenskaper for valgte objekt." #. 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 "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../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 "Legg til" -#: ../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 "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Endre Oppsett" -#: ../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 "Rett verdien for den valgte nøkkel for alle objekter" -#: ../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 "Egenskaper: {0} / Medlemskap: {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 "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Skift relasjon" -#: ../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 "Vil du slette utvalget fra relasjon {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 "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "DSlett egenskaper" @@ -4684,34 +5101,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 "Relasjoner" -#: ../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 "Åpne en liste over alle relasjoner" -#: ../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 "Relasjoner: {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 "Åpne en editor for den valgte relasjon" -#: ../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 "Slet valgt relasjon" -#: ../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 "Oprett ny relasjon" -#: ../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 "" @@ -4744,23 +5161,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 "Utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} linje" -msgstr[1] "{0} linjer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relasjon" -msgstr[1] "{0} relasjoner" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4768,78 +5171,107 @@ msgstr "Utvalg: {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 "Frigjør panelet" -#: ../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." msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../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 "Klikk for at minimere/maksimere panelet" -#: ../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 "Opphavsmenn" -#: ../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 "Åbn en liste af brugere som jobber på de valgte objekt." -#: ../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] "Opphavsmann" +msgstr[1] "Opphavsmann" + +#: ../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 "Vis" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Mer informasjon om denne funksjonen" + +#: ../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 "" +"ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" + +#: ../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 "Opphavsmann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Opphavsmenn: {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 "Last ned medlemer av relasjon" -#: ../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 "Konflikter i data" -#: ../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 "" @@ -4848,47 +5280,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 "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" -#: ../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 " @@ -4897,14 +5323,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 "" @@ -4914,9 +5340,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 "" @@ -4926,15 +5352,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4942,5 +5368,5 @@ msgstr "" -#: ../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 " @@ -4948,20 +5374,20 @@ msgstr "" -#: ../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 "" @@ -4970,57 +5396,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 "Flytt valgte medlem opp" #. 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 "Flytt valgt medlem ned" #. 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 " @@ -5029,9 +5455,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 "" @@ -5040,20 +5466,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 @@ -5063,37 +5485,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 "Last ned alle ufullstendige linjer og noder i relasjonen" -#: ../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 "Last ned medlemmer" -#: ../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 "" @@ -5103,30 +5525,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 "" @@ -5140,22 +5562,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 "Rediger relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5188,34 +5615,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] "Fjern gamle egenskapsnøkler fra {0} objekt" -msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bokmerker" -#: ../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 "Tast inn først de ønskede koordinater." -#: ../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 "Tast inn et navn for stedet." -#: ../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 "Velg først et bokmerke" @@ -5272,13 +5686,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 "Null pointer-feil, muligens manglende egenskaper." -#: ../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 "Skriv inn en søkestreng" -#: ../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 "Klarte ikke lese søkeresultat om sted fra tjener" @@ -5286,18 +5700,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 "Gi et stednavn å søke etter:" -#. 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 "Steder" #. 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 "navn" @@ -5336,37 +5749,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 "type" -#: ../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 "nær" -#: ../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 "zoom" -#: ../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: " @@ -5375,5 +5788,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 "Flytbart kart" @@ -5400,30 +5813,39 @@ msgstr "Flis-nummer" -#: ../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 "Historikk for {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 "Historikk for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historikk for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Lukk vinduet" -#: ../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 "Vis historikken for det valgte objektet" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement." -#: ../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" @@ -5432,9 +5854,9 @@ "historikken." -#: ../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 "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element." -#: ../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" @@ -5443,8 +5865,27 @@ "tilgjengelig i historikken." -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Node {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Last historikk" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "parameter «{0}» > 0 forventet – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Laster historikk for {0} med ID {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Laster historikk for {0} med ID {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Laster historikk for {0} med ID {1}" #. item "Streets/Motorway" text "Reference" @@ -5762,14 +6203,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5945,8 +6400,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" #. @@ -6043,4 +6504,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6154,6 +6618,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 @@ -6161,156 +6625,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 "Navn" -#: ../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 "" "Versjon {0} lagt til {1} av " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "endringssett" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Mer informasjon om denne funksjonen" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Siste endring på {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6318,32 +6800,287 @@ msgstr "Versjon {0} lagt til {1} av {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Versjon" -#: ../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 "Gatenavn" + +#: ../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 "Velg en verdi" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parameter «{0}» må ha en verdi" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Reparer konflikter i egenskaper." + +#: ../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] "" + +#: ../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] "" + +#: ../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 "Forkast og avslutt" + +#: ../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 "Lagre og avslutt" + +#: ../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 "Lag" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Ved opplasting" + +#: ../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 "Fil" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Laster opp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Det er ingen valgte objekter å oppdatere" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Bilder for {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 "Les 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 "Ingen tid gitt for punkt {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 "Klarte ikke lese tid «{0}» for punkt {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 "Ingen bilder med lesbare tidsstempler funnet" -#: ../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 @@ -6351,29 +7088,29 @@ msgstr "Leser {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 "Geotaggede bilder" -#: ../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 start: {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-slutt: {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 "nåværende forskjell: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "tidssone-forskjell: " -#: ../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" @@ -6382,14 +7119,14 @@ msgstr[1] "bilder" -#: ../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} innenfor sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synkronisér klokke" -#: ../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 @@ -6397,82 +7134,82 @@ msgstr "JPEG-bilder (*.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 "Klarte ikke tolke datoen i fila «{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 "Det er ikke noe EXIF-tidspunkt i fila «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Bilde" -#: ../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 "Gi den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../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-enhetens tidssone (forskjell fra foto)" -#: ../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 "Synkronisér tidspunkt med GPS-enhet" -#: ../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 "Den indtastede tid kunne ikke tolkes" -#: ../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-punkt" -#: ../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 "Tilpass linjetegning" +#: ../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 "Bruk globale indstillinger." + #: ../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 "Bruk globale indstillinger." +msgid "Draw lines between points for this layer." +msgstr "Tegn linjer mellem punkter i dette laget." #: ../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 "Tegn linjer mellem punkter i dette laget." - -#: ../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 "Tegn ikke linjer mellem punkt i dette laget." -#: ../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 "Velg linjetegnings-innstillinger" -#: ../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 "Tilpass farge" -#: ../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 "Standard" -#: ../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" @@ -6532,5 +7269,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}" @@ -6546,10 +7283,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 "Konverter til datalag" #: ../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." @@ -6560,11 +7297,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 @@ -6606,4 +7343,9 @@ "Ønsker du
å fortsette?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Laster ned data" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6626,64 +7368,64 @@ "utelatt." -#: ../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 "Datalag {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 "utenfor nedlastet område" -#: ../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 "versjon {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 "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 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} består av:" -#: ../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} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "ikke satt" -#: ../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 versjon: {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 "Konvertér til GPX-lag" -#: ../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" @@ -6691,5 +7433,5 @@ msgstr[1] "GPS spor" -#: ../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" @@ -6697,5 +7439,5 @@ msgstr[1] "punkt" -#: ../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" @@ -6704,5 +7446,5 @@ msgstr[1] "et GPS spor med {0} punkt" -#: ../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" @@ -6711,5 +7453,5 @@ msgstr[1] "{0} består av {1} GPS spor" -#: ../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" @@ -6718,9 +7460,9 @@ msgstr[1] "{0} punkt" -#: ../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-flagg" -#: ../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" @@ -6728,5 +7470,5 @@ msgstr[1] "flagg" -#: ../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" @@ -6745,5 +7487,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}." @@ -6751,5 +7493,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 "Kan ikke synkronisere i det avspillte lag." @@ -6777,5 +7519,5 @@ msgstr "Slå av/på visning av tekst/ikoner" -#: ../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 " @@ -6785,5 +7527,5 @@ "(etter første markør)." -#: ../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 " @@ -6793,29 +7535,29 @@ "i track for synkronisering." -#: ../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 "Kan ikke sette ny audio-markør" -#: ../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 "Der opstod en feil i forsøket på å vise URL'en for denne markøren" -#: ../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 "(URL var: " -#: ../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 "Feil ved visning av 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 "Avanserte innstillinger" -#: ../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 "Endre innstillingerne direkte. Vær varsom!" -#: ../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 @@ -6823,14 +7565,14 @@ msgstr "Søk: " -#: ../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 "Nåværende verdi er standard." -#: ../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 "Standardverdien er «{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 "" @@ -6838,13 +7580,13 @@ "enda)" -#: ../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 "Velg raden som skal endres" -#: ../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 @@ -6852,14 +7594,14 @@ msgstr "Ny verdi for {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 "Velg raden som skal slettes" -#: ../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 "Gi en ny nøkkel med verdi" @@ -6994,40 +7736,40 @@ msgstr "Stemme recorder kalibrering" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farge" -#: ../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 "Tegnestil {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 "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Velg" -#: ../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 "Velg en farge for {0}g" -#: ../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 "Sett til standard" -#: ../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 "Sett alt til standard" -#: ../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 "Farger brukt av forskellige objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Farger" @@ -7071,5 +7813,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Bil" @@ -7091,16 +7833,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 "Sykkel" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7130,12 +7873,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 "Til fots" @@ -7315,5 +8058,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 "Vis oppstartsskjerm" @@ -7321,23 +8064,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 "Vis objekt-ID i lister" #: ../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 "Vis objekt-ID i lister" + +#: ../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 "Tegn elastisk hjelpelinje" -#: ../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 "Arbeide uten ned- og opplasting (Potlatch-metode)" -#: ../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 "Vis objekt-ID i lister" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Ikke behov for å bytte modus. (Potlatch-metode)" -#: ../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 "Utseende og opplevelse" @@ -7369,54 +8123,54 @@ msgstr "Brukt stil" -#: ../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 "Indstil tilgængelige programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Last ned liste" -#: ../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 "Oppdater" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Sett opp nettsteder …" -#: ../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 "Legg til URL for liste over programtillegg." -#: ../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 "Velg en verdi." -#: ../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 "Rediger URL for liste over programtillegg." -#: ../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 "Indstilling på programtillegg sider" #. 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 "Visningsinnstillinger" -#: ../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 " @@ -7426,41 +8180,41 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Innstillinger for tilkobling" -#: ../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 "Innstillinger for forbindelse til OSM-tjeneren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Innstillinger for kart" -#: ../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 "Innstilinger for kartprojeksjon og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Lydinnstillinger" -#: ../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 "Innstillinger for avspilling av lyd og lyd markering." -#: ../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 "Du må starte JOSM for at enkelte innstillingene skal tre i kraft." -#: ../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 "Vis koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projeksjonsmetode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Kartprojeksjon" @@ -7493,12 +8247,4 @@ msgid "Proxy server password" msgstr "Passord for proxy-tjener" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "URL-adressen for OSM-tjeneren (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL-adresse til tjener" #. 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 @@ -7525,61 +8271,60 @@ msgstr "Hurtigtast" -#: ../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 "Kort beskrivelse: {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 "Opphavsperson: {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 "Nettside: {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 "Versjon: {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 "Velg raden du vil kopiere." -#: ../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 "Legg til ny XML kilde i liste." -#: ../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 "Slett den valgte kilden fra lista." -#: ../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 "" @@ -7765,36 +8510,59 @@ msgstr "Kombinasjonstast grupper:" -#: ../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] "Fjern gamle egenskapsnøkler fra {0} objekt" +msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Legg til nytt lag" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Slett valgt Lag." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Mer informasjon om denne funksjonen" #. 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 "Valgfrie attributter:" -#: ../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 "Bruk objektmal «{0}» i gruppe «{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 "Bruk objektmal «{0}»" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "stengt_vei" -#: ../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 "Ukjent type: {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 @@ -7802,15 +8570,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {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 "Feil ved lesing av {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 "Element type {0} kan brukes." -#: ../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 @@ -7820,22 +8588,22 @@ msgstr[1] "Endre {0} objekt" -#: ../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 "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Endre egenskaper" -#: ../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}''" @@ -7874,11 +8642,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 "Klarte ikke lese «{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 " @@ -7888,38 +8656,38 @@ "spor." -#: ../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 "GPX filer" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "beskrivelse av sporloggen" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Legg til informasjon om opphavsperson" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Fullt navn" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "E-post" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Opphavsrett (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Forhåndsvalgt" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "År for opphavsrett" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Stikkord" @@ -7929,9 +8697,9 @@ msgstr "Innstillinger for eksport" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Eksporter og lagre" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7942,10 +8710,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 "Velg en lisens" -#: ../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 @@ -7955,12 +8723,12 @@ msgstr "Markører fra {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 "Fila «{0}» finnes ikke" -#: ../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" @@ -7982,6 +8750,6 @@ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../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 @@ -7991,20 +8759,40 @@ msgstr "Laster ned OSM-data …" -#: ../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 "Rediger relasjon #{0} i lag \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over." -#: ../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 "Ingenting lagt til utvalg ved søk etter «{0}»" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8014,34 +8802,34 @@ "element." -#: ../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 filer" -#: ../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 "Importerte koordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Ugyldig koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Feil i kontrollsum: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Ukjent koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Koodinater med null: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA data er lest inn" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Feil ved import av NMEA data!" @@ -8052,9 +8840,9 @@ msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API." -#: ../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 "Denne versjonen av JOSM kan ikke lese fra tjeneren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8064,15 +8852,15 @@ "Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til {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 "Kommunikasjon er opprettet med {0} med protocol versjon {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 "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8080,33 +8868,91 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{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 "Åpner endringssett …" -#: ../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 "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Åpner endringssett …" + +#: ../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 "Åpner endringssett …" + +#: ../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 "Lukker endringssett …" -#: ../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 "Lukker endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Forbereder …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Laster opp …" -#: ../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}." @@ -8134,29 +8980,33 @@ msgstr "Ugyldig bzip2-fil" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Feil passord eller brukernavn." -#: ../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 "Advarsel: Passordet overføres ukryptert." -#: ../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 "Lagre bruker og passord (ukryptert)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Skriv inn passord" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Logg inn" -#: ../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 "URL-adressen for OSM-tjeneren (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "E-postadresse for OSM-kontoen" -#: ../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." @@ -8165,13 +9015,17 @@ "noen passord." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL-adresse til tjener" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM-brukernavn (e-post)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM passord" -#: ../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." @@ -8183,20 +9037,20 @@ "
Ikke bruk et verdifullt passord." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM-tjenerfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8205,5 +9059,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8408,35 +9262,46 @@ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." -#: ../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}gjenstår. laster {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}gjenstår. laster {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}gjenstår. laster {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 "Ingen endringer å laste opp. Finn frem data først." + +#: ../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 "Opdater programtillegg" -#: ../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 "Last ned Programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8449,5 +9314,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." @@ -8456,23 +9321,23 @@ msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt." -#: ../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 "Laster ned programtillegg {0} …" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Hopp over nedlasting" -#: ../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 versjon {0} er nødvendig for programtillegg {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Last ned programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Hopp over nedlasting" @@ -8483,15 +9348,15 @@ msgstr "Det oppsto feil i programtillegget {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 "Programtillegg {0} krever JOSM-oppdatering til versjon {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." @@ -8499,15 +9364,15 @@ "Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." -#: ../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 "Fant ikke programtillegget: {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 "Siste oppdaterte programtillegg for {0} dager siden." -#: ../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 " @@ -8517,21 +9382,21 @@ "oppstettet '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 "Fjern programtillegg" -#: ../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 "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Behold programtillegg" -#: ../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 " @@ -8541,5 +9406,5 @@ "skrive over eksisterende." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8547,10 +9412,10 @@ msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{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 "I følge nformasjon i tilleggsprogram, er {0} opphavsmann." -#: ../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." @@ -8558,9 +9423,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../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 "Skal programtillegget fjernes?" -#: ../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 " @@ -8570,13 +9435,13 @@ "lese programtillegg." -#: ../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" @@ -8587,5 +9452,5 @@ msgstr "Flere detaljer" -#: ../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" @@ -8594,18 +9459,18 @@ msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Fant ikke info om programtillegg." -#: ../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 "" -#: ../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 "Alle installerte programtillegg er siste versjon." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8618,9 +9483,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 "Last ned programtillegg som mangler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8633,35 +9498,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}: Versjon {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 "Programtillegg inkludert i 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 "Feil oppsto ved lesing av info om programtillegg: {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 "Dette er etter avsluttingen av opptaket" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Feil med avspilling av lyd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Ikke gjør noe" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Rapporter feil" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8675,14 +9540,14 @@ "versjon av JOSM, setter vi pris på en feilrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "En uventet unntakstilstand" -#: ../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 "Venligst send en feilrapport på {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 "" @@ -8691,5 +9556,5 @@ "Vær detaljert. Bruk engelsk." -#: ../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 " @@ -8699,19 +9564,19 @@ "sender feilrapport." -#: ../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 "Husk å inkludere følgende informasjon:" -#: ../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 "(Teksten har alt blitt kopiert til utklippstavlen din.)" -#: ../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 "Fant ikke oversettelsen for {0}. Bruker {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 "" @@ -8720,5 +9585,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8727,5 +9592,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8738,5 +9603,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" @@ -8746,5 +9611,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8755,21 +9620,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 "(Hint: Du kan endre hurtigtastene i Innstillinger.)" -#: ../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 "" @@ -8798,9 +9698,27 @@ msgstr "Lag rutenett med linjer" -#: ../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 "Last opp sporlogg" -#: ../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 @@ -8808,29 +9726,40 @@ msgstr "Last opp sporlogger" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Offentlig" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "" -"Dette medfører at din sporlogg blir offentlig tilgjengelig på 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 "Beskrivelse" -#: ../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 "Oppgi en beskrivelse av sporloggen." -#: ../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 "Oppgi egenskaper til sporet" -#: ../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}" @@ -8838,47 +9767,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 "Kobler til …" -#: ../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 "Opplastingen ble avsluttet" -#: ../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 "Feil under opplastingen" -#: ../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 opplastingen var vellykket" -#: ../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 "Klarte ikke laste opp. Tjeneren gav følgende svar: " -#: ../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 "Laster opp GPX spor: {0}% ({1} av {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 "Ingen beskrivelse er gitt. Legg inn beskrivelse av sporet" -#: ../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 lag er ikke valgt -> Ingen spor å laste opp." -#: ../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 "Ingen Brukernavn er oppgitt." -#: ../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 "Det er ikke oppgitt passord." -#: ../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 Spor lastes opp" @@ -8991,19 +9920,19 @@ msgstr "Last inn bildesett som et nyt lag." -#: ../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 Filer (*.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 "Fila {0} er lastet inn under navnet «{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 "Feil oppsto ved sending av {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." @@ -9014,34 +9943,34 @@ "
Skriv inn tidspunktet og velg tidssone
" -#: ../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 "Tidspunkt for foto (fra 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 tidspunkt (lest i bildet ovenfor): " -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "Jeg er i tidssonen: " -#: ../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 "Ingen dato" -#: ../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 "Åpne et annet foto" -#: ../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 "Synkroniser tiden fra et bilde på GPS-mottakeren" -#: ../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" @@ -9051,70 +9980,70 @@ "Sjekk format" -#: ../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 "Ugyldig dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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-spor: " -#: ../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 "Åpne flere GPX-spor" -#: ../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 "Tidssone: " -#: ../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 "Forskyvning:" -#: ../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 "" "Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" -#: ../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 "Opdater posisjon for: " -#: ../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 "Alle bilder" -#: ../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 "Bilder uden EXIF-posisjon" -#: ../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 "Bilder uten egenskaper" -#: ../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 "Jevnfør bilder med GPX spor" -#: ../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 "Jevnfør" -#: ../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 "Automatisk forslag" -#: ../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 "Du bør velge et GPX-spor" -#: ../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 "Intgen GPX-spor er valgt" -#: ../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 "" @@ -9125,9 +10054,9 @@ "Forventet format: {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 "Ugyldig tidssone" -#: ../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 "" @@ -9138,65 +10067,65 @@ "Forventet format: {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 "Ugyldig forskyvning" -#: ../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 "Fant {0} treff av {1} i GPX spor {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-spor er lagt inn" -#: ../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 "Valgte foto har ikke tidskode." -#: ../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 "Foto har ikke tidskode." -#: ../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." msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." -#: ../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 sporet har ikke tidskoder" -#: ../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 "Tidssone: {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 "Minutter: {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 "Sekunder: {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 "Koplet {0} av {1} foto til GPX spor." -#: ../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 "(Tidsforskjell på {0} dager)" -#: ../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 "Forskyvning mellom spor og foto: {0}m {1}s" -#: ../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 " @@ -9206,13 +10135,13 @@ "synkronisere bildene manuelt." -#: ../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 "Klarte ikke å koble foto til sporet" -#: ../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 "Juster tidssone og forskyvning" -#: ../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 "Standardverdier" @@ -9233,5 +10162,5 @@ msgstr "Feil i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9244,12 +10173,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 "Velg alt" - -#: ../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 "Feil ved lasting av fil" @@ -9278,8 +10206,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 "" "Fransk by/sted {0} ikke funnet eller tilgjengelig i WMS.\n" @@ -9290,21 +10218,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 "Velg kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Velg fra …" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../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" @@ -9317,37 +10245,48 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../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 "JOSM avsluttes for at endringen skal tre i kraft." -#: ../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 "Bytt ut original bakgrunn med JOSM bakgrunnfarge." -#: ../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 "Omvend grå farger (for svart bakgrunn)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Sett backgrunn transparent." -#: ../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 "Vis grenser for nedlatede data." -#: ../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 "Aktiviser automatisk mellomlager." -#: ../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 "Max. lager størrelse (i MB)" -#: ../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." @@ -9364,9 +10303,9 @@ "
før du laster inn data med dette programtillegget." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "Fransk cadastre 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 "" @@ -9374,10 +10313,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Kilde" -#: ../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 " @@ -9386,5 +10325,5 @@ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for 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). " @@ -9394,41 +10333,39 @@ "tekst på mørk bakgrunn." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Tillat stabling av flere lag" -#: ../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 "Sett transperens på WMS lag. Høyre: opak, venstre: transparent." -#: ../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 "Trekk et rektangel rundt data lastet ned fra WMS-tjener." #. 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 "Image grab multiplier:" - -#: ../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 "Hent mindre bilder (høyere kvalitet men minnekrevende)" -#: ../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 "Fast kvadrat størrelse (standard er 100m)" -#: ../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 "Fast størrelse (fra 25 til 1000 meter)" -#: ../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 "Image grab multiplier:" - -#: ../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 "" @@ -9487,12 +10424,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Kobler til WMS-tjener …" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "Bilde er ikke lest inn" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9526,20 +10461,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" @@ -9547,9 +10482,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 "laster bilde …" + +#: ../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" @@ -9557,31 +10498,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 "Gi inn Lat/Lon for posisjon du vil gå til" - -#: ../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 "øst" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "nord" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Behold tjenerens koordinater" +msgid "Set " +msgstr "Velg" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9645,6 +10594,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)" @@ -9668,6 +10617,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 "Blankt lag" @@ -9683,7 +10632,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Raster midtpunkt: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10209,6 +11158,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 "vann" @@ -10221,8 +11170,4 @@ msgid "land" msgstr "land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "ingen" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10515,9 +11460,9 @@ msgstr "OpenStreetBugs download-løkke" -#: ../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 "Vis tema i 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 " @@ -10529,5 +11474,5 @@ "nye tjeneren? (Anbefalt)" -#: ../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 "Bytte til ny openstreetbugs-tjener?" @@ -11100,5 +12045,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 "Gatenavn" @@ -11117,29 +12062,29 @@ msgstr "Vis Opphavsmenn Panel" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Åpne brukerside" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Åpne brukerside i utforsker" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Velg brukers data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Bytt ut utvalg med brukers data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Velg data først" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Velg en bruker fra panel med opphavsmenn" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Beklager. Anonyme brukere får ikke lov til dette." @@ -11153,23 +12098,15 @@ msgstr "Slår sammen områder med overlapp" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Fortsett uansett" - -#: ../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 "Bare to områder kan bli slått sammen foreløpig." -#: ../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}» er ikke lukket, og kan derfor ikke være med i sammenføyning." -#: ../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" @@ -11181,38 +12118,38 @@ "Er du sikker på at du vil fortsette?" -#: ../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 "Angre hvis du er usikker" -#: ../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 "Velg minst én lukket linje å sammenføye med." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Fant ingen skjæring. Ingen endringer ble gjort." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Noder er lagt til i alle skjæringspunkt" -#: ../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 "Slette indre linjer som ikke er del av multipolygon (relasjoner)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Reparer relasjoner" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Slo sammen områder som overlappet seg selv" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Slo sammen overlappende områder" -#: ../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 " @@ -11222,81 +12159,81 @@ "oppstått." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Reparer konflikter i egenskaper." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Fjernede Element fra Relasjoner" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Slå sammen arealer: fjern korte linjer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Lukket linje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Fjern egenskaper fra indre linjer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funksjon Slå sammen Areal" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Gå til Posisjon" -#: ../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 "Åpner dialog som lar deg gå til bestemt posisjon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Gi inn Lat/Lon for posisjon du vil gå til" -#: ../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 "Du kan også lime inn URL fra www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (i meter)" -#: ../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 "Gå dit" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Gå til posisjon" -#: ../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 "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Kunne ikke tolke Lat / Lon" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Forenkle linje" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Slett overflødige noder fra en linje." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Velg minst én linje å forenkle." -#: ../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?" @@ -11306,25 +12243,25 @@ msgstr[1] "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Er du sikker?" -#: ../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 "Valideringsfeil" -#: ../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 "Ingen valideringsfeil" -#: ../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 "Rutenett" -#: ../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 "" @@ -11415,53 +12352,53 @@ msgstr "Kjører datavalidering" -#: ../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 "Data med feil. Last opp uansett?" -#: ../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 "Åpne valideringsvindu" -#: ../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 "Zoom til problem" -#: ../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 "Korriger" -#: ../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 "Korriger valgte feilmeldinger." -#: ../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 "Ignorer" -#: ../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 "Ignorer valgte feilmeldinger neste gang." -#: ../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 "Hele gruppen" -#: ../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 "Enkelte element" -#: ../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 "Intet" -#: ../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 "Ignorer hele gruppen eller enkelte element?" -#: ../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 "Ignorerer element" -#: ../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" @@ -11485,23 +12422,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 "" "Denne testen undersøker om to veier, jernbaner eller vannveier krysser i " "samme lag, uten å være knyttet i knutepunkt." -#: ../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 "Lag bygninger" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Kryssende veier" -#: ../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 "Dobbelt-Noder" -#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Noder med samme navn" + +#: ../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 "Fordoble linje" + +#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Opprett kopi av linje" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11586,23 +12556,23 @@ msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving." -#: ../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 "Egenskapskontroll" -#: ../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 "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier." -#: ../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 "Ugyldig egenskapskontroll-linje – {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 "Ugyldig stavekontroll linje: {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 "" @@ -11613,7 +12583,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 "Ulovlige kombinasjoner Egenskap / Verdi" @@ -11621,80 +12591,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 "Problem med visning" -#: ../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 "Nøkkel «{0}» er ugyldig." -#: ../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 "Egenskaper uten verdier" -#: ../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 "Ulovlig egenskapsnøkkel" -#: ../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 "Ulovlig mellomrom i Nøkkel" -#: ../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 "Egenskap Verdi starter eller slutter med mellomrom" -#: ../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 "Egenskap Verdi inneholder HTML koding" -#: ../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 "Nøkkel «{0}» finnes ikke i objektmalene" -#: ../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 "Objektmalene inneholder ikke Nøkkelen" -#: ../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 "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene" -#: ../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 "Objektmalen har ikke Egenskapsverdi" -#: ../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 "Sjekk egenskabsnøkler" -#: ../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 "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste." -#: ../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 "Bruk avansert egenskapskontroll." -#: ../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 "Kontroller egenskapsverdiene med hjelp av avanserte regler." +#: ../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 "Egenskapskontroll-kilde" -#: ../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." @@ -11704,82 +12674,82 @@ "org/index.php/User:JLS/speller) eller \"tag checking data files\"." -#: ../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 "Tilføy en ny kilde til lista." -#: ../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 "Rediger valgt kilde." -#: ../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 "Datakilder" -#: ../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 "Sjekk egenskapsverdier." -#: ../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 "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene." -#: ../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 "Se etter 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 "Søker etter noder eller linjer med FIXME i en egenskapsverdi" -#: ../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 "Finn notater om tegning." -#: ../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 "Sjekk etter feil ved opptegning." -#: ../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 "Bruk standard datafil." -#: ../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 "Bruk standard datafil (anbefales)." +#: ../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 "Bruk standard fil for stavekontroll." -#: ../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 "Brug standard fil for stavekontroll (anbefales)." -#: ../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 "Korriger egenskaper" -#: ../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 "Kunne ikke finne element-typen" -#: ../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 "Kunne ikke finne advarsels-niveå" -#: ../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 "Ugyldig uttrykk «{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}''" @@ -11924,7 +12894,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 "bygning" @@ -11938,5 +12908,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 "område" @@ -12072,5 +13042,5 @@ msgstr "Nådde et kryss" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Det oppsto en feil" @@ -12138,14 +13108,14 @@ msgstr "Hjelp WMS tilleggsprogram" -#: ../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 "Ortografisk korrekt bilde …" -#: ../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}" @@ -12156,26 +13126,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 "Selvvalgt WMS-adresse" -#: ../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 "Gå til hjemmeside" -#: ../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 eller bilde-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 " @@ -12183,37 +13153,55 @@ msgstr "" -#: ../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 "Ingen gyldig WMS-URL eller ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Tilpass 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 "Tilpass posisjon på valgt WMS lag" -#: ../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 "" @@ -12228,105 +13216,145 @@ msgstr "Automatisk nedlasting" -#: ../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 "brukertype" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS lag ({0}) laster automatisk ned i zoom {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 lag ({0}) laster ned i zoom {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 "Ugyldig dato" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../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}" msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../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 "Åpne tomt WMS lag til data fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Innstillinger WMS Programtillegg" -#: ../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 "Rediger liste over WMS-tjenere som vises i WMS-programtillegg" -#: ../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 "Meny Navn" -#: ../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 URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Meny Navn (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Gi meny navn og WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Kopier Standard" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Velg minst én linje" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Nedlaster:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "TCX filer (*.tcx)" #. * @@ -12725,62 +13753,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 "Veinummer" - -#. 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 "Lag" #. item "Streets/Motorway" combo "Layer" @@ -12795,5 +13768,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 "Kjørebaner" @@ -12808,5 +13781,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" @@ -12816,10 +13788,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 "Hastighetsbegrensning (km/t)" @@ -12863,9 +13835,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 "Enveiskjøring" @@ -12913,13 +13885,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 "Bro" @@ -12961,13 +13933,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 "Tunnel" @@ -13007,12 +13979,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 "Skjæring" @@ -13052,12 +14024,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 "Øy" @@ -13213,17 +14185,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 "Bredde ( meter)" @@ -13250,4 +14222,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" @@ -13266,11 +14239,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 "Veidekke" @@ -13280,4 +14254,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" @@ -13292,9 +14267,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 "fast dekke" @@ -13302,10 +14278,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 "uten fast dekke" + +#: 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 "Feriehytter" + +#: 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 "betong" + +#: 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 "Bilutleie" + +#. 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 "skogsområde" + +#: 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 "parkeringsbillett" #. item "Ways/Track Grade 2" combo "Surface" @@ -13313,12 +14352,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 "brostein" + +#: 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 "grus" + +#: 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 "brostein" + +#: 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 "uferdig" + +#: 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 "gress" + +#: 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 "gress" + +#: 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 "sand" + +#. 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 "jord" #. item "Streets/Residential" text "Width (meters)" @@ -13399,20 +14520,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Restriksjoner" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Rediger restriksjioner" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Avgift" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Ingen gjennomkjøring" @@ -13425,8 +14546,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 "Adkomst" @@ -13461,32 +14582,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 "ja" @@ -13499,40 +14635,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 "privat" -#: 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 "brukertype" @@ -13545,19 +14681,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 "destinasjon" @@ -13580,65 +14716,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 "permissive" -#: 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 "Skog- og Landbruk" -#: 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 "nei" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Varer" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Tung last (hgv)" @@ -13653,10 +14794,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 "Hest" @@ -13672,17 +14813,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 "Motorsykkel" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13694,30 +14834,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 "Motorkjøretøy" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Offentlige Tjenestekjøretøy (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorbåt" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Båt" #. 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 "Min. hastighet (km/t)" @@ -13725,25 +14865,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 "maks totalvekt" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. Høyde (meter)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. Bredde (meter)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. Lengde (meter)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rundkjøring" @@ -13754,5 +14894,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 "Rediger kryss" @@ -13768,5 +14908,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" #. @@ -13774,9 +14914,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 "Type" @@ -13796,10 +14936,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 "motorway" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorway_link" @@ -13821,10 +14961,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 "trunk" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "trunk_link" @@ -13846,10 +14986,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 "riksvei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "tilkjørselsvei_riksvei" @@ -13871,5 +15011,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" @@ -13884,9 +15024,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "kommunevei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "småvei" @@ -13900,9 +15040,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "boligvei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "gatetun" @@ -13932,10 +15072,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 "adkomstvei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "trikkespor" @@ -13965,6 +15105,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 "veiarbeid" @@ -13975,10 +15115,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 "Rediger bro" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Rediger tunnel" @@ -13986,19 +15126,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Gater" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Veiarbeid" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Rediger vei under bygging" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Kryss" @@ -14014,5 +15154,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rundkjøring" @@ -14021,5 +15161,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Ridevei" @@ -14027,5 +15167,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Rediger ridevei" @@ -14033,5 +15173,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Sykkelvei" @@ -14041,11 +15181,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 "Rediger sykkelvei" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Gågate" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Gangvei" @@ -14054,11 +15200,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Rediger gangvei" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pigghinder" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Gågate" @@ -14067,5 +15219,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Rediger gågate" @@ -14073,5 +15225,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Trapper" @@ -14081,5 +15233,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 "Rediger trapper" @@ -14088,5 +15240,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Traktorvei" @@ -14095,39 +15247,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Rediger traktorvei" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "betong" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "grus" - -#. 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 "jord" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "gress" - -#: 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 "sand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Traktorvei klasse 1" @@ -14136,5 +15260,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Rediger traktorvei klasse 1" @@ -14142,5 +15266,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Traktorvei klasse 2" @@ -14149,5 +15273,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Rediger traktorvei klasse 2" @@ -14155,5 +15279,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Traktorvei klasse 3" @@ -14162,5 +15286,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Rediger traktorvei klasse 3" @@ -14168,5 +15292,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Traktorvei klasse 4" @@ -14175,5 +15299,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Rediger traktorvei klasse 4" @@ -14181,5 +15305,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Traktorvei klasse 5" @@ -14188,5 +15312,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Rediger traktorvei klasse 5" @@ -14195,5 +15319,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Sti" @@ -14202,19 +15326,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Rediger sti" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Snøscooter" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. 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 "Tursti" @@ -14224,5 +15351,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 "Rediger tursti" @@ -14230,5 +15357,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Fjellsti" @@ -14238,5 +15365,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 "Rediger fjellsti" @@ -14244,5 +15371,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Krevende fjellsti" @@ -14252,5 +15379,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 "Rediger krevende fjellsti" @@ -14258,5 +15385,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Alpin fjellsti" @@ -14266,5 +15393,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 "Rediger alpin fjellsti" @@ -14272,5 +15399,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Krevende alpin fjellsti" @@ -14280,5 +15407,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 "Rediger krevende alpin fjellsti" @@ -14286,5 +15413,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Vanskelig alpin fjellsti" @@ -14294,5 +15421,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 "Rediger vanskelig alpin fjellsti" @@ -14300,10 +15427,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Veipunkt" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Motorveikryss" @@ -14311,15 +15438,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Rediger motorveikryss" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Service" @@ -14327,5 +15454,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Rediger Serviceområde" @@ -14339,4 +15466,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" #. @@ -14356,18 +15485,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 "Operatør" @@ -14376,5 +15507,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Trafikklys" @@ -14384,5 +15515,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Type gangfelt" @@ -14391,27 +15522,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 "ukontrollert" -#: 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 "trafikklys" -#: 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 "trafikkøy" -#: 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 "umerket" #. 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 "Kryssende ridevei" @@ -14419,6 +15550,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 "Kryssende sykkelvei" @@ -14427,11 +15558,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 "Betjent fotgjengerfelt" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Crossing type name (UK)" @@ -14439,30 +15570,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 "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelican" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Full stopp" @@ -14470,5 +15601,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Fotgjengerfelt" @@ -14477,14 +15608,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Rediger fotgjengerfelt" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Type name (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rundkjøring" @@ -14495,14 +15626,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 "Retning" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "med_klokka" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Vendesirkel" @@ -14512,20 +15643,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 "Bygrense" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Rediger bygrenseskilt" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Annet navn" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Fotoboks" @@ -14533,5 +15664,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Nødtelefon" @@ -14539,5 +15670,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Stigning" @@ -14545,5 +15676,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Sterk stigning" @@ -14552,10 +15683,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Vadested" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Rediger vadested" @@ -14563,5 +15694,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Fjellpass" @@ -14569,5 +15700,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Rediger fjellpass" @@ -14575,11 +15706,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 "Høyde" @@ -14587,5 +15718,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Stengsel" @@ -14593,5 +15724,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Sperresøyle" @@ -14599,5 +15730,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Rediger sperresøyle" @@ -14642,16 +15773,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 "Tillatt trafikk:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Halvbommer" @@ -14660,5 +15791,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Steinblokk" @@ -14666,5 +15797,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Ferist" @@ -14672,10 +15803,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Rediger ferist" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bussluse" @@ -14683,15 +15814,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pigghinder" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Rediger pigghinder" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Bomstasjon" @@ -14699,5 +15830,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Rediger bomstasjon" @@ -14705,10 +15836,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Tollstasjon" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Rediger tollstasjon" @@ -14718,5 +15849,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Hekk" @@ -14725,5 +15856,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Gjerde" @@ -14732,5 +15863,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mur" @@ -14738,5 +15869,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Bymur" @@ -14745,5 +15876,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Støttemur" @@ -14755,15 +15886,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Inngang" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Rediger inngang" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Port" @@ -14771,50 +15902,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Rediger port" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Veibom" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Rediger veibom" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Gjerdestengsel" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Rediger gjerdestengsel" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Støtfangergjerde" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Rediger støtfangergjerde" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Fotgjengerport" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Rediger fotgjengerport" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Gjerdetrapp" @@ -14822,25 +15953,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Rediger gjerdetrapp" #. 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 "Sortiport" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Rediger sortiport" @@ -14851,10 +15982,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 "Vann" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Vannkilde" @@ -14862,5 +15993,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Rediger vannkilde" @@ -14868,5 +15999,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Drenering" @@ -14874,10 +16005,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Rediger drenering" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Bekk" @@ -14885,10 +16016,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Rediger bekk" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -14896,10 +16027,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Rediger kanal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Elv" @@ -14909,5 +16040,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 "Rediger elv" @@ -14915,15 +16046,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Rediger vann" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Rediger land" @@ -14931,15 +16062,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Basseng" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Rediger basseng" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Drikkevannskilde" @@ -14947,15 +16078,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Rediger drikkevannskilde" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Tildekt drikkevannskilde" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Rediger tildekt drikkevannskilde" @@ -14963,5 +16094,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Elvebredd" @@ -14970,10 +16101,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Rediger elvebredd" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Våtmarksområde" @@ -14984,14 +16115,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 "Rediger våtmarksområde" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Sumpområde" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "Flytemyr" @@ -15005,35 +16136,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "Myrområde" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "Sivområde" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "Saltmyr" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "Tidevannsflate" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "Mangrove" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Gjørme" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Rediger gjørme" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Strand" @@ -15041,20 +16172,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Rediger strand" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Havbukt" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Rediger havbukt" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Klippe" @@ -15062,10 +16193,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Rediger klippe" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Kystlinje" @@ -15073,5 +16204,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Rediger kystlinje" @@ -15079,5 +16210,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Fergerute" @@ -15085,5 +16216,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Rediger fergerute" @@ -15092,5 +16223,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Skipsverft" @@ -15098,10 +16229,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Rediger skipsverft" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Tørrdokk" @@ -15109,5 +16240,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Rediger tørrdokk" @@ -15115,5 +16246,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Demning" @@ -15121,15 +16252,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Rediger demning" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Punkt i vann" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Sluseport" @@ -15138,5 +16269,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Terskeldam" @@ -15144,20 +16275,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Rediger terskeldam" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Foss" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Rediger foss" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Snuplass" @@ -15166,15 +16297,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Rediger marina" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Brygge" @@ -15182,10 +16313,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Rediger brygge" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Fergeleie" @@ -15193,10 +16324,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Rediger fergeleie" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Båtslipp" @@ -15206,5 +16337,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 "Rediger båtslipp" @@ -15212,10 +16343,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Jernbane" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Jernbane" @@ -15223,5 +16354,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Rediger jernbane" @@ -15251,8 +16382,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 "Alternative typer" @@ -15266,35 +16397,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 "Stasjonsområde" -#: 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 "Sidespor" -#: 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 "Privat sidespor" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Smal jernbane" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Rediger smal jernbane" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15302,45 +16433,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Rediger Monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Fredet bane" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Rediger fredet bane" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Bybane" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Rediger bybane" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "T-bane" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Rediger T-bane" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Trikk" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Rediger trikk" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Busspor" @@ -15348,5 +16479,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Rediger busspor" @@ -15355,14 +16486,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Nedlagt jernbane" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Rediger nedlagt jernbane" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Revet jernbane" @@ -15371,5 +16502,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Planovergang" @@ -15378,5 +16509,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Fotgjengerfelt" @@ -15386,5 +16517,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Type fotgjengerfelt" @@ -15392,5 +16523,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Dreieskive" @@ -15399,10 +16530,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Taubaner og -heiser" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Stolheis" @@ -15410,10 +16541,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Rediger stolheis" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "T-krokheis" @@ -15421,10 +16552,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Rediger T-krokheis" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Taubane" @@ -15432,10 +16563,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Rediger taubane" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Gondolbane" @@ -15443,5 +16574,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Rediger gondolbane" @@ -15449,5 +16580,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 "Stasjon" @@ -15458,10 +16589,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 "Rediger stasjon" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Bensinstasjon" @@ -15471,9 +16602,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 "Rediger bensinstasjon" #. 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 "Åpningstider" + +#. 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" @@ -15493,106 +16853,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Rediger parkering" #. 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 "Referansenummer" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "P-hus" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "Overflateparkering" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "P-kjeller" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Innfartsparkering" + +#. 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 "Gebyr" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapasitet" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Handicap-plasser" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Handicap-plasser" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Handicap-plasser" + +#: 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 "Bilvask" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Rediger bilvask" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Butikk" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Rediger bilforretning" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Verksted" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Rediger verksted" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Bilutleie" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Rediger bilutleie" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Bildeling" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Rediger bildeling" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Rediger sykkelparkering" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapasitet" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "Overflateparkering" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "P-hus" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "P-kjeller" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "Innfartsparkering" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Handicap-plasser" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Gebyr" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Bilvask" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Rediger bilvask" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Butikk" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Rediger bilforretning" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Verksted" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Rediger verksted" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Bilutleie" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Rediger bilutleie" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Bildeling" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Rediger bildeling" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Rediger sykkelparkering" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Rediger sykkelutleie" @@ -15601,15 +16996,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Rediger sykkelbutikk" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Offentlig transport" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Internasjonal UIC-jernbanekode" @@ -15617,5 +17012,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Jernbanestopp" @@ -15623,5 +17018,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Rediger jernbanestopp" @@ -15629,5 +17024,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Trikkestopp" @@ -15636,5 +17031,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Rediger trikkestopp" @@ -15642,5 +17037,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Jernbaneplattform" @@ -15649,5 +17044,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Rediger jernbaneplattform" @@ -15659,5 +17054,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 "Spornummer" @@ -15665,10 +17060,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 "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "T-baneinngang" @@ -15677,10 +17072,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Rediger T-baneinngang" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rullestol" @@ -15689,5 +17084,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busstasjon" @@ -15696,5 +17091,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Rediger busstasjon" @@ -15702,5 +17097,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bussholdeplass" @@ -15710,5 +17105,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 "Rediger bussholdeplass" @@ -15717,8 +17112,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 "Leskur / Ly for natten" @@ -15726,10 +17119,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Bussplatform" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Rediger bussplattform" @@ -15737,5 +17130,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15743,5 +17136,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Rediger taxi-stasjon" @@ -15749,5 +17142,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Flyplass" @@ -15755,15 +17148,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Rediger flyplass" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15772,5 +17165,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Overnatting" @@ -15782,5 +17175,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -15789,15 +17182,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Rediger hotell" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stjerner" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motell" @@ -15805,20 +17198,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Rediger motell" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Gjestehus" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Rediger gjestehus" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Feriehytter" @@ -15826,10 +17219,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Rediger feriehytter" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Ungdomsherberge" @@ -15837,30 +17230,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Rediger ungdomsherberge" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Fjellstue" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Rediger fjellstue" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Campingvognplass" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Rediger campingvognplass" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Campingplass" @@ -15868,10 +17261,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Rediger campingplass" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Mat og drikke" @@ -15882,5 +17275,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -15888,5 +17281,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Rediger restaurant" @@ -15894,5 +17287,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 "Kjøkken" @@ -15900,61 +17293,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 "italiensk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "kinesisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "gatekjøkken" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "gresk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "tysk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "lokal" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "tyrkisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "meksikansk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japansk" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Gatekjøkken" @@ -15962,9 +17355,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Rediger gatekjøkken" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kafé" @@ -15972,10 +17365,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Rediger kafé" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -15983,20 +17375,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Rediger pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Rediger Biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16004,10 +17394,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Rediger bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Nattklubb" @@ -16015,33 +17404,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Rediger nattklubb" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turisme" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attraksjon" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Rediger attraksjon" -#. 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 "Åpningstider" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -16049,10 +17429,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Rediger museum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoologisk hage" @@ -16061,10 +17440,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Rediger zoologisk hage" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Utsiktspunkt" @@ -16072,25 +17450,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Rediger utsiktspunkt" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Utsiktstårn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Temapark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Rediger temapark" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Kunstverk" @@ -16098,5 +17475,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Rediger kunstverk" @@ -16104,86 +17481,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Turistinformasjon" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Rediger turistinformasjon" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Kart" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Karttype" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "kart" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "bykart" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "turkart" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "sykkelkart" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Full stopp" + +#. 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 "gate" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "kinesisk" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Last ned område" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Lim inn" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Storby" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "lokal" #. 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 "Nærmere forklaring" #. 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 "Sykling" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Fjellsti" + +#. 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 "Ski" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "Sidespor" + +#. 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 "Informasjonstavle" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Tavletype" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "infotavle" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Tollstasjon" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "begynner" + +#: build/trans_presets.java:1737 msgid "history" msgstr "historisk" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "natur" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "dyreliv" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "bruk av grunn" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Veiviser (turvei)" -#. 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 "Informasjon" + +#. 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 "Nærmere forklaring" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Telefonnummer" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Annen informasjon" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Rediger ly for natten" @@ -16191,25 +17693,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 "Bålplass" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Piknik-sted" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Rediger piknik-sted" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historiske steder" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Slott" @@ -16218,20 +17720,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Rediger slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruiner" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Rediger ruiner" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Arkeologisk plass" @@ -16240,10 +17741,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Rediger arkeologisk plass" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Slagmark" @@ -16251,5 +17751,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Rediger slagmark" @@ -16257,15 +17757,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Rediger monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Minneplatte" @@ -16273,45 +17773,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Rediger minneplatte" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Kors i veikant" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Rediger kors i veikant" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Veialter" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Rediger veialter" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Fritid" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Badepark" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Rediger badepark" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Lekeplass" @@ -16319,15 +17819,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Rediger lekeplass" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Fiskeplass" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Rediger fiskeplass" @@ -16335,15 +17835,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sport" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Rediger stadion" @@ -16357,6 +17857,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 "velg sport:" @@ -16748,30 +18248,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 "sport" @@ -16781,227 +18281,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 "flerbruk" -#: 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 "bueskyting" -#: 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 "turn" -#: 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 "australsk fotball" -#: 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 "baseball" -#: 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 "basketball" -#: 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 "boules" -#: 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 "bowls" -#: 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 "kano" -#: 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 "klatring" -#: 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 "cricket" -#: 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 "cricketnett" -#: 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 "krocket" -#: 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 "sykling" -#: 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 "hundeløp" -#: 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 "ridning" -#: 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 "football" -#: 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 "golf" -#: 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 "gymnastikk" -#: 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 "ishockey" -#: 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 "hesteløp" -#: 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 "motorsport" -#: 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 "pelota" -#: 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 "racquet" -#: 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 "rugby" -#: 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 "skyting" -#: 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 "skateboard" -#: 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 "skøyter" -#: 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 "ski" -#: 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 "fotball" -#: 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 "svømming" -#: 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 "bordtennis" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sportssenter" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Rediger sportssenter" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Bane" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Rediger bane" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Racerbane" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Rediger racerbane" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfbane" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Rediger golfbane" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Rediger minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Flerbruk" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Rediger flerbruk" @@ -17040,248 +18538,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 "bane" -#: 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 "sportssenter" -#: 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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Rediger bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Turn" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Rediger turn" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Bueskyting" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Rediger bueskyting" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klatring" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Rediger klatring" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kano" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Rediger kano" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Sykling" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Rediger sykling" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Hundeløp" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Rediger hundeløp" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Ridning" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Rediger ridning" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Hesteløp" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Rediger hesteløp" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastikk" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Rediger gymnastikk" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorsport" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Rediger motorsport" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skøyter" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Rediger skøyter" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Rediger skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Svømming" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Rediger svømming" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Ski" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Rediger ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Løypetype" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "slalom" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "langrenn" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snøpark" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Vanskelighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "begynner" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "enkel" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "middels" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "vanskelig" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "ekspert" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "fristil" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Skyting" @@ -17289,178 +18779,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Rediger skyting" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Ballsport" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fotball" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Rediger fotball" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Amerikansk fotball" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Rediger amerikansk fotball" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australsk fotball" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Rediger australsk fotball" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Rediger baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Rediger basketball" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Rediger golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golfbane" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Rediger boule" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowls" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Rediger bowls" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Rediger cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricketnett" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Rediger cricketnett" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Krocket" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Rediger krocket" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Ishockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Rediger ishockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Rediger pelota" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Racquet" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Rediger racquet" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Rediger rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Bordtennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Rediger bordtennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Rediger tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Bygninger" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bygning" @@ -17468,5 +18958,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Offentlig bygning" @@ -17474,10 +18964,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Rediger offentlig bygning" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Rådhus" @@ -17485,10 +18975,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Rediger rådhus" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassade" @@ -17496,10 +18986,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Rediger ambassade" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Domstol" @@ -17508,10 +18998,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Rediger domstol" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Fengsel" @@ -17520,10 +19010,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Rediger fengsel" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Politi" @@ -17533,10 +19023,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 "Rediger politi" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Brannstasjon" @@ -17545,10 +19035,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Rediger brannstasjon" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postkontor" @@ -17556,5 +19046,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Rediger postkontor" @@ -17562,15 +19052,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Barnehage" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Rediger barnehage" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Skole" @@ -17578,10 +19068,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Rediger skole" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universitet" @@ -17589,10 +19079,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Rediger universitet" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Høyskole" @@ -17600,5 +19090,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Rediger høyskole" @@ -17606,5 +19096,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kino" @@ -17613,10 +19103,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Rediger kino" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliotek" @@ -17625,10 +19115,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Rediger bibliotek" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Kunstsenter" @@ -17636,10 +19125,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Rediger kunstsenter" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teater" @@ -17648,10 +19137,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Rediger teater" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Tilbedelsessted" @@ -17661,5 +19150,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 "Rediger tilbedelsessted" @@ -17668,6 +19157,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 "Religion" @@ -17676,66 +19165,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 "bahai" -#: 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 "buddhist" -#: 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 "kristen" -#: 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 "hindu" -#: 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 "jain" -#: 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 "jødisk" -#: 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 "muslim" -#: 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 "sikh" -#: 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 "spiritualist" -#: 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 "taoist" -#: 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 "unitarisk" -#: 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 "zoroastrisk" -#: 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 "Trosretniing" @@ -17744,81 +19233,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 "anglikansk" -#: 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 "baptist" -#: 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 "katolsk" -#: 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 "evangelisk" -#: 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 "Jehovas vitner" -#: 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 "luthersk" -#: 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 "metodist" -#: 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 "mormoner" -#: 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 "ortodoks" -#: 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 "pinsebevegelsen" -#: 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 "presbyteriansk" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresser" @@ -17827,5 +19316,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Rediger adresseinformasjon" @@ -17833,5 +19322,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Husnummer" @@ -17839,20 +19328,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Husnavn" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "By/sted" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postnummer" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Landskode" @@ -17860,5 +19349,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpoler adresser" @@ -17867,5 +19356,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Rediger interpolasjon" @@ -17873,71 +19362,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Nummereringsmåte" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "oddetall" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "partall" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "alle" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Menneskeskapt" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabrikk" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Rediger fabrikk" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Tårn" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Rediger tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vanntårn" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Rediger vanntårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gassbeholder" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Rediger gassbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Fyrtårn" @@ -17945,10 +19430,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Rediger fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Vindmølle" @@ -17956,10 +19441,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Rediger vindmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Rørledning" @@ -17967,10 +19452,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Rediger rørledning" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Kloakkrenseanlegg" @@ -17980,10 +19465,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 "Rediger kloakkrenseanlegg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Kran" @@ -17991,10 +19476,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Rediger kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Fyrlykt" @@ -18002,10 +19487,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Rediger fyrlykt" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Trigonometrisk punkt" @@ -18013,10 +19498,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Rediger trigonometrisk punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Overvåkingskamera" @@ -18024,5 +19509,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Rediger overvåkingskamera" @@ -18030,5 +19515,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Kraftverk" @@ -18038,39 +19523,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 "Rediger kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vann" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "atom" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kull" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "solcelle" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gass" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Kraftstasjon" @@ -18079,10 +19564,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Rediger kraftstasjon" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformatorstasjon" @@ -18091,5 +19576,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Rediger transformatorstasjon" @@ -18097,10 +19582,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 "Linjenummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Kraftmast" @@ -18111,5 +19596,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 "Rediger kraftmast" @@ -18117,5 +19602,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Kraftlinje" @@ -18124,46 +19609,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Rediger kraftlinje" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Spenning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Antall ledere" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Fasiliteter" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toaletter" -#. 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 "Referansenummer" - #. 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 "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -18172,5 +19651,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Rediger telefon" @@ -18178,5 +19657,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 "Mynter" @@ -18184,5 +19663,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 "Sedler" @@ -18190,5 +19669,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 "Elektronisk lommebok eller betalingskort" @@ -18196,5 +19675,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 "Bankkort" @@ -18202,15 +19681,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 "Kredittkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Returstasjon" @@ -18219,5 +19698,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Rediger returstasjon" @@ -18225,80 +19704,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Bokser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Klær" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Metall" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Benk" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Jaktpost" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Rediger jaktpost" -#. 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 "Høyde" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "lav" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "halv" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "full" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Skjul" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Lås" -#. 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 "Høyde" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "lav" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "halv" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "full" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontene" @@ -18307,10 +19782,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Rediger fontene" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Drikkevann" @@ -18319,10 +19794,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Rediger drikkevann" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Stellebord" @@ -18330,25 +19805,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Rediger stellebord" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarked" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Rediger supermarked" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Feriehytter" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Rediger feriehytter" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Minimarked" @@ -18356,10 +19841,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Rediger Minimarked" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18367,10 +19851,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Rediger kiosk" -#. 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 "Rediger bussholdeplass" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Rediger tre" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Automat" @@ -18378,5 +19881,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Rediger automat" @@ -18384,88 +19887,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Automatprodukter" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "billetter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "buss-, trikk- og togkart" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parkeringsbillett" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "mat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "godter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "sigaretter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "foto" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "dyremat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "leker" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "frimerke" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "sedler" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "hundeposer" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "kundekort" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Slakter" @@ -18473,10 +19976,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Rediger slakter" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Baker" @@ -18484,10 +19986,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Rediger baker" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Blomster" @@ -18495,20 +19996,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Rediger blomster" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Økologisk" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Rediger økologisk" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Sprit og vin" @@ -18516,60 +20015,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Rediger sprit og vin" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Drikke" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Rediger drikke" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Dataelektronikk" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Rediger dataelektronikk" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronikk" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Rediger elektronikk" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Rediger hifi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Møbler" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Rediger møbler" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Hagesenter" @@ -18577,10 +20070,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Rediger hagesenter" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Jernvarehandel" @@ -18588,10 +20080,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Rediger jernvarehandel" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Byggevare" @@ -18599,60 +20090,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Rediger byggevare" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Kontor" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Rediger kontor" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Frisør" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Rediger frisør" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Sko" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Rediger sko" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Leker" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Rediger leker" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Rediger video" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Renseri" @@ -18660,10 +20145,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Rediger renseri" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Vaskeri" @@ -18671,10 +20155,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Rediger vaskeri" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Friluftsutstyr" @@ -18682,35 +20165,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Rediger friluftsutstyr" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sport" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Rediger sport" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Rediger optiker" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Valuta" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -18718,16 +20198,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Rediger bank" -#. 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 "Minibank" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Veksle valuta" @@ -18735,5 +20213,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Rediger valutaveksling" @@ -18741,15 +20219,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Rediger minibank" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Helse" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Lege" @@ -18757,20 +20235,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Rediger lege" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Tannlege" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Rediger tannlege" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apotek" @@ -18778,5 +20254,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Rediger apotek" @@ -18784,10 +20260,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Reseptlevering" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Sykehus" @@ -18795,10 +20270,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Rediger sykehus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Redningsmøtepunkt" @@ -18807,5 +20282,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Rediger redningsmøtepunkt" @@ -18814,20 +20289,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Navn på punkt" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Telefonnummer" #. 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 "(Bruk internasjonalt nummer, f.eks. +12-345-67890)" @@ -18835,5 +20310,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 "Veterinær" @@ -18842,55 +20317,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Rediger veterinær" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Rediger kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Rediger land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Delstat/provins" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Rediger delstat/provins" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Rediger region (fylke)" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Kommune" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Rediger kommune" @@ -18898,15 +20373,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Storby" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Rediger storby" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "By" @@ -18914,10 +20389,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Rediger by" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Forstad/bydel" @@ -18925,25 +20400,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Rediger forstad/bydel" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Landsby" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Rediger landsby" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Grend" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Rediger grend" @@ -18951,5 +20426,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Lokalitet" @@ -18957,10 +20432,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Rediger lokalitet" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Øy" @@ -18968,11 +20443,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Rediger øy" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "venstre" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Rediger feriehytter" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Huleinngang" @@ -18980,10 +20468,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Rediger huleinngang" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Fjelltopp" @@ -18991,10 +20479,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Rediger fjelltopp" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Isbre" @@ -19002,10 +20490,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Rediger isbre" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkan" @@ -19013,70 +20501,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Rediger vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Grenser" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nasjonal" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Rediger landegrense" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Fylkesgrense" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Rediger fylkesgrense" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Kommunegrense" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Rediger kommunegrense" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politisk" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Rediger politisk grense" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Nasjonalpark" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Rediger nasjonalparkgrense" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Bruk av grunn" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Tre" @@ -19085,15 +20573,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Rediger tre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Skogsområde" @@ -19102,5 +20590,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Rediger skogsområde" @@ -19108,17 +20596,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 "barskog" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "løvskog" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "blandingsskog" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Skog" @@ -19127,14 +20615,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Rediger skog" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Rediger naturreservat" @@ -19142,25 +20630,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Steinur" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Rediger steinur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Krattskog" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Rediger krattskog" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Fjell" @@ -19168,10 +20656,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Rediger fjell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Beite" @@ -19179,5 +20667,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Rediger beite" @@ -19185,5 +20673,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Gårdstun" @@ -19192,45 +20680,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Rediger gårdstun" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Åkerland" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Rediger åkerland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Eng" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Rediger eng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Rediger vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Hageparseller" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Rediger hageparseller" @@ -19238,25 +20726,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Hage" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Rediger hage" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Gress" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Rediger gress" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Friområde" @@ -19264,10 +20752,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Rediger friområde" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Offentlig" @@ -19275,20 +20763,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Rediger offentlig" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Rediger park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Friluftsområde" @@ -19296,5 +20784,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Rediger friluftsområde" @@ -19302,15 +20790,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Boligområde" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Rediger boligområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Gravlund" @@ -19318,9 +20806,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Rediger gravlund" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Kirkegård" @@ -19328,39 +20816,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Rediger kirkegård" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Forretninger" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Rediger forretninger" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Næringsområde" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Rediger næringsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industriområde" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Rediger industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Jernbanegrunn" @@ -19368,15 +20856,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Rediger jernbanegrunn" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Millitært" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Rediger millitært" @@ -19384,55 +20872,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Byggeplass" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Rediger byggeplass" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Rivningsområde" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Rediger rivningsområde" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Byggeområde" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Rediger byggeområde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Avfallsdeponi" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Rediger avfallsdeponi" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Steinbrudd" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Rediger steinbrudd" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19442,5 +20930,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 "Rediger multipolygon" @@ -19449,10 +20937,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "ytre linjesegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "indre linjesegment" @@ -19460,5 +20948,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Svingeforbud" @@ -19467,5 +20955,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Rediger svingeforbud" @@ -19473,34 +20961,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Forbud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "venstresving forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "høyresving forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "rett frem forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "u-sving forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "påbudt høyresving" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "påbudt venstresving" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "påbudt rett frem" @@ -19509,15 +20997,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "fra linje" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "via node eller linje" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "til linje" @@ -19525,5 +21013,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Rute" @@ -19532,5 +21020,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Rediger rute" @@ -19538,5 +21026,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Rutetype" @@ -19608,5 +21096,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 @@ -19615,17 +21103,17 @@ msgstr "sykkel" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "vei" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "ferge" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19678,5 +21166,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 @@ -19685,13 +21173,13 @@ msgstr "fotgjenger" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "tur" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "trikk" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "omkjøring" @@ -19705,10 +21193,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "T-bane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Symbolforklaring" @@ -19716,31 +21204,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Nettverk" #. 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 "planlagt" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Farge (hex)" @@ -19749,30 +21237,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "rutesegment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "neste segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "forrige segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "stoppepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "neste stoppunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "forrige stoppunkt" @@ -20210,11 +21698,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 "uønsket" @@ -20540,41 +22028,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 "gate" #. color street @@ -22275,5 +23726,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 "light_vann" @@ -22872,55 +24323,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22934,5 +24336,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 "turisme" @@ -23004,8 +24406,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 "historisk" @@ -23076,8 +24478,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 "grønn" @@ -23091,5 +24493,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "steinbrudd" @@ -23103,5 +24505,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "avfallsdeponi" @@ -23123,5 +24525,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "vannmagasin" @@ -23135,5 +24537,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "skog" @@ -23147,5 +24549,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "gårdstun" @@ -23168,5 +24570,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "butikker" @@ -23180,5 +24582,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industri" @@ -23192,5 +24594,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "rivningsområde" @@ -23204,5 +24606,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "byggeområde" @@ -23216,5 +24618,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "jernbanegrunn" @@ -23271,7 +24673,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 "millitært" @@ -23285,5 +24687,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "gravlund" @@ -23296,5 +24698,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "fjelltopp" @@ -23309,5 +24711,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "isbre" @@ -23321,5 +24723,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulkan" @@ -23374,8 +24776,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 "natur" @@ -23389,5 +24791,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "krattskog" @@ -23401,20 +24803,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "beiteområde" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "skogsområde" - #. color water #. 1 @@ -23425,5 +24815,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "søle" @@ -23437,5 +24827,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "strand" @@ -23513,8 +24903,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 "rute" @@ -23562,7 +24952,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 "grense" @@ -23704,10 +25094,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 "sted" @@ -23755,6 +25154,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 "adresse" @@ -24051,9 +25450,88 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Velg Tableau d'Assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Feilmelding: cannot check conditions for no layer. Send inn en " +#~ "feilmelding." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ingen åpne dokument å lagre" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Slett {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Fjern relasjonsmedlem {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan ikke åpne innstillingsmappe: {0}" + +#~ msgid "nodes" +#~ msgstr "noder" + +#~ msgid "ways" +#~ msgstr "linjer" + +#~ msgid "relations" +#~ msgstr "relasjoner" + +#~ msgid "changesets" +#~ msgstr "endringssett" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Klarte ikke laste historikk fra tjeneren. Detaljer:
{0}" + +#~ msgid "Delete Layer" +#~ msgstr "Slett Lag" + +#~ msgid "Authors: {0}" +#~ msgstr "Opphavsmenn: {0}" + +#~ msgid "Public" +#~ msgstr "Offentlig" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på " +#~ "openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting." + +#~ msgid "Continue anyway" +#~ msgstr "Fortsett uansett" + +#~ msgid "Edit Information Office" +#~ msgstr "Rediger turistinformasjon" + +#~ msgid "Map Type" +#~ msgstr "Karttype" + +#~ msgid "map" +#~ msgstr "kart" + +#~ msgid "citymap" +#~ msgstr "bykart" + +#~ msgid "hikingmap" +#~ msgstr "turkart" + +#~ msgid "bicyclemap" +#~ msgstr "sykkelkart" + +#~ msgid "Board Type" +#~ msgstr "Tavletype" + +#~ msgid "board" +#~ msgstr "infotavle" #~ msgid "Move" @@ -24164,7 +25642,4 @@ #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" - -#~ msgid "Not implemented yet." -#~ msgstr "Ikke implementert enda." #~ msgid "Layers: {0}" @@ -24309,4 +25784,7 @@ #~ msgid "Invalid projection" #~ msgstr "Ugyldig kartprojeksjon" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Velg Tableau d'Assemblage" #~ msgid "Adjust the position of the WMS layer" @@ -24448,7 +25926,4 @@ #~ msgstr "Mangler objekt" -#~ msgid "image loading..." -#~ msgstr "laster bilde …" - #~ msgid "Aborting..." #~ msgstr "Avbryter …" @@ -24516,4 +25991,7 @@ #~ msgstr "Bruk ufullstendige løsninger" +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)" + #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Lag {0} må være i listen over lag" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 17484) +++ /applications/editors/josm/i18n/po/nl.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-15 13:46+0000\n" -"Last-Translator: Valentijn Sessink \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-04 20:21+0000\n" +"Last-Translator: bartgenuit \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\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" -#: ../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 "Hoofdscherm aanmaken" #. 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 "Help" -#: ../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 "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" -#: ../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 @@ -96,157 +99,162 @@ #: ../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 "Fout" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe gegevens " -"naar de server." - -#: ../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] "" +"Wijzigingen zijn niet opgeslagen. Deze wijzigingen negeren en verder gaan?" +msgstr[1] "" +"Wijzigingen zijn niet opgeslagen. Deze wijzigingen negeren en verder gaan?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Niet-opgeslagen wijzigingen" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "" -"Wijzigingen zijn niet opgeslagen. Deze veranderingen negeren en verder gaan?" - -#: ../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 "Sla op en verlaat JOSM" -#: ../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 "Negeer veranderingen en verlaat JOSM" -#: ../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 "Annuleren" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ongeldige URL negeren: \"{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 "Waarschuwing" -#: ../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 "Ongeldige bestands-URL negeren: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -271,7 +279,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 +318,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" @@ -328,9 +337,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 msgid "License" -msgstr "" +msgstr "Licentie" #: ../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 "Plugins" @@ -347,13 +356,21 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +"Selecteer minstens één reeds opgeladen knooppunt, weg of relatie a.u.b." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -362,5 +379,5 @@ msgstr "" -#: ../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 "" @@ -370,11 +387,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -383,5 +400,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 "" @@ -398,11 +415,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 @@ -431,5 +448,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 "Breedtegraad" @@ -438,30 +455,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 "Lengtegraad" +#: ../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 "Knopen uitlijnen in een cirkel" -#: ../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 "De geselecteerde knopen in een cirkel plaatsen." -#: ../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 @@ -475,6 +492,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 @@ -482,58 +499,57 @@ msgstr "Gereedschap: {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 "Selecteer minstens vier knopen." #. 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 "Informatie" #. 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 "Knopen uitlijnen" -#: ../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 "De geselecteerde knopen op een lijn plaatsen" -#: ../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 "Selecteer minstens drie knopen:" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -544,10 +560,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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -556,5 +572,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -565,46 +581,46 @@ "maximumwaarde {2}. De lengte is nu {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} knopen in weg {1} overschrijdt het maximum aantal knopen {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "gegevens" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "Laag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "selectie" -#: ../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 "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "download" +#: ../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 "Inzoomen op {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 "Beeld inzoomen op {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 @@ -614,22 +630,22 @@ msgstr "Beeld: {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 "Geen selectie om op in te zoomen." -#: ../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 "Geen conflicten om op in te zoomen" +#: ../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 "Wegen combineren." -#: ../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 "Verschillende wegen combineren tot één weg." -#: ../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 "Selecteer twee of meer wegen om te combineren." @@ -640,4 +656,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Toch combineren" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -647,19 +667,7 @@ "u zeker dat u ze wilt combineren?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Toch combineren" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Richting omkeren?" - -#: ../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 "" -"De wegen kunnen in hun huidige richtingen niet worden gecombineerd. Wil je " -"de richting van enkele omkeren?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -667,27 +675,34 @@ msgstr "Omkeren en combineren" -#: ../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 "" +"De wegen kunnen in hun huidige richtingen niet worden gecombineerd. Wil je " +"de richting van enkele omkeren?" + +#: ../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 "Waarden voor alle conflicten invoeren." -#: ../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 "Conflicten oplossen" -#: ../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} wegen combineren" -#: ../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 "Alle wegen zijn leeg" -#: ../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 " @@ -697,32 +712,32 @@ "reeks van knopen)" +#: ../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 "Kopiëren" -#: ../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 "Geselecteerde objecten naar klembord kopiëren" -#: ../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 "Selecteer iets om te kopiëren" +#: ../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 "Cirkel aanmaken" -#: ../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 "Een cirkel uit drie knopen maken." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -734,20 +749,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 "Verwijderen" @@ -757,85 +772,86 @@ msgstr "Geselecteerde objecten verwijderen." -#: ../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 "Overschrijven?" -#: ../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 "Bestand bestaat al. Overschrijven?" #. 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 "Knopen verdelen" -#: ../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 "De geselecteerde knopen equidistant langs een lijn verdelen." +#: ../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 "Downloaden vanuit 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 "Kaart downloaden van de OSM-server." -#: ../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 "Bestand: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Downloaden" -#: ../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 "Selecteer tenminste één taak om te downloaden" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "Er waren {0} tegenstrijdigheden tijdens het importeren." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -844,6 +860,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 "Dupliceren" @@ -867,85 +883,91 @@ msgstr "De applicatie afsluiten." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Alle afbeeldingen" + +#: ../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 "Exporteren naar 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 "De gegevens naar een GPX-bestand exporteren." -#: ../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 "Geen gegevens om te exporteren, maak deze eerst." -#: ../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 "Parameter \"{0}\" mag niet leeg zijn." -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM Online-hulp" -#: ../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 "Openen in browser" -#: ../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 "Bewerken" -#: ../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 "Herladen" -#: ../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 "Kan alleen hulppagina's van JOSM Online-hulp bewerken" -#: ../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 "Fout tijdens het laden van {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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -997,22 +1019,26 @@ 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 "Knopen samenvoegen" -#: ../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 "Knopen in de oudste samenvoegen" -#: ../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 "Minstens twee knopen selecteren om samen te voegen." -#: ../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 "Knopen met verschillende relaties samenvoegen?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Toch samenvoegen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1022,9 +1048,5 @@ "samenvoegen?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Toch samenvoegen" - -#: ../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 "" @@ -1032,69 +1054,69 @@ "in gebruik is." -#: ../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} knopen samenvoegen" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Spiegelen" -#: ../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 "Spiegel de geselecteerde knopen en wegen." -#: ../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 "Selecteer ten minste één knoop of weg." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "omhoog" -#: ../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 "Objecten {0} verplaatsen" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "omlaag" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "links" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "rechts" -#: ../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} verplaatsen" -#: ../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 "Verplaatst objecten {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 "Kan objecten niet buiten de wereld plaatsen." @@ -1102,5 +1124,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 "Nieuw" @@ -1110,17 +1132,22 @@ msgstr "Een nieuwe kaart aanmaken." -#: ../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 "Openen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Een bestand openen." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Een bestand openen." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Onbekende rol \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1158,21 +1185,17 @@ msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Slechts twee knopen toegestaan" -#: ../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 "Selectie mag slechts wegen bevatten." -#: ../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 "Één of meer gesloten wegen met minstens vier knopen selecteren." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." - -#: ../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 " @@ -1181,9 +1204,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 "Slechts één knoop geselecteerd" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Orthogonaal maken" @@ -1199,13 +1222,26 @@ msgstr "Inhoud van het buffer plakken." -#: ../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 "Tags plakken" -#: ../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 "Inhoudtags uit klembord toepassen op alle geselecteerde items." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "{0} laden" +msgstr[1] "{0} laden" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1231,37 +1267,32 @@ msgstr "De laatste ongedaan gemaakte opdracht herstellen." -#: ../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 "Laag hernoemen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Ook het bestand hernoemen" -#: ../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 "" +#: ../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 "Wegen omkeren" -#: ../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 "De richting van alle geselecteerde wegen omkeren." -#: ../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 "Selecteer minstens één weg." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Wegen omkeren" @@ -1269,10 +1300,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 "Opslaan" #: ../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 "Huidige gegevens opslaan." @@ -1283,37 +1315,25 @@ msgstr "Het bestand {0} bestaat al. Overschrijven?" -#: ../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 "" -"Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer " -"dit als fout a.u.b." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Geen document geopend, dus ook niets om op te slaan." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Leeg document" -#: ../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 "Het document bevat geen gegevens." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Toch opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflicten" -#: ../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 " @@ -1323,28 +1343,28 @@ "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Conflicten verwerpen en opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "OSM-bestand opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "GPX-bestand opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Laag opslaan" +#: ../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 "Opslaan als..." -#: ../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 "De huidige gegevens in een nieuw bestand opslaan." @@ -1378,33 +1398,33 @@ msgstr "Hulp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Statusrapport" -#: ../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 "Klembord kopiëren en sluiten" -#: ../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 "Sluiten" +#: ../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 "Weg splitsen" -#: ../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 "Een weg bij de geselecteerde knoop splitsen." -#: ../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 "De huidige selectie kan niet gebruik worden voor splitsen." -#: ../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." @@ -1412,5 +1432,5 @@ msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg." -#: ../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 " @@ -1426,9 +1446,9 @@ "heeft, Selecteer ook de weg." -#: ../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 "De geselecteerde knopen hebben niet dezelfde weg gemeen." -#: ../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." @@ -1436,11 +1456,11 @@ msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen." -#: ../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 "" "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen" -#: ../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 " @@ -1450,5 +1470,5 @@ "selecteer knopen in het midden van de weg.)" -#: ../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 " @@ -1456,5 +1476,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 " @@ -1462,8 +1482,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 "Weg {0} in {1} delen splitsen" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Changeset sluiten" + +#: ../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 "Changeset sluiten" + +#: ../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 "Changeset openen" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Changeset sluiten" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1481,47 +1526,47 @@ msgstr "De algemene instelling \"{0}\" in-/uitschakelen" +#: ../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 "Wegen losmaken" -#: ../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 "Dubbele knopen die door meerdere wegen worden gebruikt." -#: ../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 "De knoop is met niets anders verbonden." -#: ../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 "Geen van deze knopen is met iets anders verbonden." -#: ../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 "Geen van deze wegknopen is met iets anders verbonden" -#: ../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 "De huidige selectie kan niet worden gebruikt voor het losmaken." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Selecteer één van beide:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Een getagde knoop, of" -#: ../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 "* een knoop die gebruikt is door meer dan een weg, of" +#: ../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 "" +"* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" + #: ../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 "" -"* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" - -#: ../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" @@ -1530,5 +1575,5 @@ "weg, of" -#: ../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." @@ -1537,5 +1582,5 @@ "één weg." -#: ../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" @@ -1549,9 +1594,9 @@ "geselecteerd worden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Ongebonden knoop" -#: ../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" @@ -1559,5 +1604,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" @@ -1603,61 +1648,71 @@ "gegevens)" -#: ../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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selectie leeg" -#: ../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 "Naar OSM uploaden..." -#: ../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 "Upload alle aanpassingen naar de OSM-server." -#: ../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 "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Niets om te uploaden. Creëer eerst gegevens." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Geen aanpassingen aanwezig om te uploaden." -#: ../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 "Synchroniseer alleen {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 "Synchroniseer alle gegevens" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1671,17 +1726,17 @@ msgstr "" -#: ../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 "Tegenstrijdigheid ontdekt" #. 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 "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1692,32 +1747,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Deze veranderingen uploaden?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Aanpassingen uploaden" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Een nieuwe knoop aan een bestaande weg toevoegen" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1725,31 +1818,79 @@ 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 "Beschrijf kort de veranderingen die je upload:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Kaartinstellingen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objecten om toe te voegen:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objecten om te bewerken:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objecten om aan te verwijderen:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Beschrijf kort de veranderingen die je upload:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Deze veranderingen uploaden?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Aanpassingen uploaden" - -#: ../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] "Objecten om toe te voegen:" +msgstr[1] "Objecten om toe te voegen:" + +#: ../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] "Objecten om te bewerken:" +msgstr[1] "Objecten om te bewerken:" + +#: ../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] "Objecten om aan te verwijderen:" +msgstr[1] "Objecten om aan te verwijderen:" + +#: ../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 "Laatste verandering op {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1773,20 +1914,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 "Geluid: {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 "Sneller" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Sneller vooruit" @@ -1828,10 +1969,10 @@ msgstr "Speel vanaf vorige marker" -#: ../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 "Langzamer" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Langzaam vooruit" @@ -1859,31 +2000,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 "Geen gegevens geïmporteerd." -#: ../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-gegevens" -#: ../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 "Download {0} van {1} ({2} te gaan)" -#: ../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 "Fouten tijdens download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1895,20 +2032,20 @@ msgstr "" -#: ../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 "Verwijdermodus" -#: ../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 "Knopen of wegen verwijderen." -#: ../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 @@ -1917,5 +2054,5 @@ msgstr "Modus: {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 " @@ -1925,55 +2062,69 @@ "behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen." -#: ../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 "" +#: ../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 "Tekenen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Knopen tekenen" -#: ../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 "Modus: tekenmodus" -#: ../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 @@ -1981,38 +2132,38 @@ msgstr "geselecteerd" -#: ../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 "Kan geen knoop buiten de wereld toevoegen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Knoop toevoegen" -#: ../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 "Knoop in weg toevoegen" -#: ../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 "Bestaande weg aan knoop koppelen" -#: ../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 "Een nieuwe knoop aan een bestaande weg toevoegen" -#: ../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 "Knoop in weg voegen en verbinden" -#: ../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 "Nieuwe node maken." -#: ../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 "Selecteer de node onder de cursor." -#: ../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." @@ -2021,14 +2172,14 @@ msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen." -#: ../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 "Start een nieuwe weg vanaf de node." -#: ../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 "Weg voortzetten vanaf laatste knoop." -#: ../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 "Tekenen beëindigen" @@ -2048,5 +2199,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 "De muisknop loslaten om objecten in het rechthoek te selecteren." @@ -2059,5 +2210,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 "De muisknop loslaten om het roteren te stoppen." @@ -2075,17 +2226,18 @@ "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren." +#: ../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 "Selecteer" -#: ../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 "Objecten selecteren, verplaatsen en roteren" -#: ../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" @@ -2094,25 +2246,29 @@ msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." @@ -2121,5 +2277,5 @@ "met dichtstbijzijnde knoop." -#: ../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-" @@ -2146,60 +2302,60 @@ "omlaag, rechts; verplaats met rechter knop" +#: ../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 "Zoeken..." -#: ../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 "Naar objecten zoeken." -#: ../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 "Voer een zoekopdracht in:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "Selectie vervangen" -#: ../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 "Toevoegen aan selectie" -#: ../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 "Verwijderen uit selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "Hoofdlettergevoelig" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "Reguliere expressie" -#: ../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 "Lange straat - 'Lange' en 'straat' in een sleutel of naam." -#: ../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 "\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." -#: ../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:Lange - 'Lang' ergens in de naam." -#: ../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 - sleutel 'type' met exacte waarde '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, " @@ -2209,110 +2365,111 @@ "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:Lange - geen 'Lang' in de naam." -#: ../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: - sleutel=foot, met een willekeurige waarde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Speciale zoekopdrachten:" -#: ../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: - objecttype (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 "gebruiker:... - alle objecten veranderd door gebruiker" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - object met opgegeven ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - object met opgegeven ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - object met opgegeven aantal knopen" -#: ../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 - alle aangepaste objecten" -#: ../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 - alle geselecteerde objecten" -#: ../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 - alle incomplete objecten" -#: ../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 "ongetagd - alle objecten zonder tag" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Gebruik | of OR om te combineren met een logische OR" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "Gebruik ( en ) om expressies te groeperen" -#: ../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 "Zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Start zoeken" -#: ../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 "Geen overeenkomst gevonden voor ''{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 "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../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 "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../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} overeenkomsten gevonden" -#: ../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" @@ -2347,5 +2504,5 @@ #, java-format msgid "Unexpected token: {0}" -msgstr "" +msgstr "Onverwacht token: {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517 @@ -2377,58 +2534,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Selectie laden" -#: ../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 "Verbinden met {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Downloaden..." -#: ../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 "Kan niet lezen van URL: \"{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 "Ontleedfout in URL: \"{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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Knoop toevoegen" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relaties: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "{0} object wijzigen" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Laatste verandering op {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Relatie wijzigen" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Verwijder \"{0}\" voor {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Verwijder \"{0}\" voor {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 "Verwijder \"{0}\" voor {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Stel in {0}={1} voor {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 "Stel in {0}={1} voor {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Stel in {0}={1} voor {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" @@ -2437,10 +2632,10 @@ msgstr[1] "objecten" -#: ../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 "Verwijder \"{0}\" voor {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}" @@ -2452,5 +2647,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2459,10 +2654,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2471,5 +2666,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}''" @@ -2493,44 +2688,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "{1} {0} verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "{0} {1} verwijderen" - -#: ../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} verwijderen" +msgstr[1] "{0} {1} verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Verwijdermodus" +msgstr[1] "Verwijdermodus" + +#: ../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} verwijderen" +msgstr[1] "{0} {1} verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Uit relatie verwijderen" +msgstr[1] "Uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Conflicterende relatie" -#: ../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 "Uit relatie verwijderen" + +#: ../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 "" "Selectie \"{0}\" wordt gebruikt door relatie \"{1}\" met rol {2}.\n" "Uit relatie verwijderen?" -#: ../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 "Uit relatie verwijderen" - -#: ../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 "" "Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n" "Verwijder van relatie?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Wegsegment splitsen" @@ -2538,6 +2749,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." @@ -2549,5 +2760,5 @@ "niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2556,7 +2767,7 @@ #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgstr "Conflicten in verwijderde toestand oplossen in {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2591,10 +2802,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2607,17 +2828,37 @@ msgstr "Volgorde" -#: ../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 "Los {0} tag-conflicten op in {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 "Los {0} tag-conflicten op in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Los {0} tag-conflicten op in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../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 "Versieconflicten voor {0} {1} oplossen" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Versieconflicten voor {0} {1} oplossen" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Versieconflicten voor {0} {1} oplossen" @@ -2645,13 +2886,13 @@ "consistent te houden." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relatie" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Oude rol" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nieuwe rol" @@ -2670,62 +2911,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 "Nieuwe waarde" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Geselecteerde wijzigingen toepassen" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Wijzigingen niet toepassen" -#: ../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 "Selecteer welke wijzigingen in eigenschappen je wilt toepassen." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Eigenschappen van " -#: ../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 "Rollen in relaties verwijzen naar" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Automatische tagcorrectie" -#: ../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 "Configuratiebestand is verminkt in regels {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan voorkeurenmap niet openen: {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 "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {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 "Voorkeuren opgeslagen op {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 "Kan geen voorkeuren uploaden. Reden: {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 "Kan geen voorkeuren van server laden." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2739,29 +3037,36 @@ msgstr "" -#: ../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 "Decimale graden" -#: ../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 "Graden minuten seconden" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "Z" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "W" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "O" -#: ../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}" @@ -2773,15 +3078,229 @@ msgstr "" -#: ../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 "onvolledig" - -#: ../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 "Fout: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Waarschuwing: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Oppervlak van weg is niet gesloten." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Multipolygone weg \"{0}\" is niet gesloten." + +#. 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 "Relatie bevat leeg lid." + +#: ../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 "Lid \"{0}\" in relatie wissen." + +#: ../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 "Weg \"{0}\" met minder dan twee punten." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Meer dan een \"van\"-weg gevonden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Meer dan een \"naar\"-weg gevonden." + +#: ../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 "Meer dan éé \"via\" gevonden." + +#: ../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 "Onbekende rol \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Onbekend lidtype voor \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Geen \"van\"-weg gevonden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Geen \"naar\"-weg gevonden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Geen \"via\"-knoop of -weg gevonden." + +#: ../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 "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop." + +#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/" + +#: ../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 "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg." + +#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Stijl voor beperking {0} is niet gevonden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Niet-weg \"{0}\" in multipolygoon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Geen buitenweg voor multipolygoon \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Binnenweg \"{0}\" is uitwendig." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "niet-getagd" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "tekst" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inactief" + #: ../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" @@ -2790,22 +3309,7 @@ msgstr[1] "knopen" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Fout: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Waarschuwing: {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" @@ -2814,12 +3318,7 @@ msgstr[1] "wegen" -#: ../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" @@ -2828,246 +3327,4 @@ msgstr[1] "relaties" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} lid" -msgstr[1] "{0} leden" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "snelweg" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "spoorweg" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "waterweg" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "grondgebruik" - -#: ../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} knoop" -msgstr[1] "{0} knopen" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Oppervlak van weg is niet gesloten." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Multipolygone weg \"{0}\" is niet gesloten." - -#. 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 "Relatie bevat leeg lid." - -#: ../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 "Lid \"{0}\" in relatie wissen." - -#: ../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 "Weg \"{0}\" met minder dan twee punten." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Meer dan een \"van\"-weg gevonden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Meer dan een \"naar\"-weg gevonden." - -#: ../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 "Meer dan éé \"via\" gevonden." - -#: ../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 "Onbekende rol \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Onbekend lidtype voor \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Geen \"van\"-weg gevonden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Geen \"naar\"-weg gevonden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Geen \"via\"-knoop of -weg gevonden." - -#: ../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 "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop." - -#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/" - -#: ../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 "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg." - -#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Stijl voor beperking {0} is niet gevonden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Niet-weg \"{0}\" in multipolygoon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Geen buitenweg voor multipolygoon \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Binnenweg \"{0}\" is uitwendig." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "niet-getagd" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "tekst" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inactief" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3080,5 +3337,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "achtergrond" @@ -3088,5 +3345,5 @@ msgstr "markeren" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3096,5 +3353,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3111,21 +3368,21 @@ "nieuwe zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert-zone (Frankrijk)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert-zone (Estland)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Zwitsers raster (Zwitserland)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3146,8 +3403,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3155,15 +3412,101 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Niet meer tonen" -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "onvolledig" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "snelweg" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "spoorweg" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "waterweg" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "grondgebruik" + +#: ../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} knoop" +msgstr[1] "{0} knopen" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} lid" +msgstr[1] "{0} leden" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "onbekend" + +#: ../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 "" @@ -3173,36 +3516,9 @@ msgstr "" -#: ../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 "onbekend" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3212,9 +3528,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 "" @@ -3223,9 +3539,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3234,9 +3550,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 "" @@ -3246,9 +3573,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Onbekende host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3258,11 +3585,6 @@ msgstr "" -#: ../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 "" @@ -3280,38 +3602,38 @@ msgstr "\"Dagmelding\" downloaden" -#: ../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 "Voorkeuren uploaden" -#: ../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 "De huidige voorkeuren naar de server uploaden" -#: ../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 "string" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Naam van gebruiker." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM-wachtwoord" -#: ../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 "De applet op de gegeven afmetingen instellen (BREEDTExHOOGTE)" -#: ../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 "string;string;..." -#: ../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 " @@ -3321,5 +3643,5 @@ "lat=y&lon=x&zoom=z of een bestandsnaam" -#: ../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 " @@ -3329,5 +3651,5 @@ "lat=y&lon=x&zoom=z of een bestandsnaam" -#: ../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 " @@ -3337,9 +3659,9 @@ "achtige zoekstring of een URL die een OSM-XML terugkrijgt" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "iedere" -#: ../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 "" @@ -3347,67 +3669,86 @@ "plaats van gelezen." -#: ../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 "Gebruikersnaam" -#: ../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 "Wachtwoord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "gebruik" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Deze hulptekst tonen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standaard UNIX-geometrieargument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Het omgrensde gebied downloaden" -#: ../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 "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden" -#: ../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 "Open bestand (als rawe GPS, indien .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 "Het omgrensde gebied downloaden als rawe 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 "Met de opgegeven zoekactie selecteren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Gemaximaliseerd openen" -#: ../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 "De voorkeuren herstellen op standaardwaarden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "De taal instellen." -#: ../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 "voorbeelden" -#: ../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" @@ -3417,25 +3758,25 @@ "zorg dat je wat gegevens laadt voor --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 "In plaats van --download= kun je ook osm:// opgegeven\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Bijgewerkte plugins activeren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Vroege plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Standaarden instellen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Plugins laden" -#: ../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." @@ -3444,22 +3785,22 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Bestand" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Gereedschappen" -#: ../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 "Voorkeuze" -#: ../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 @@ -3471,21 +3812,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 "Draadmodelweergave" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Draadmodelweergave in- of uitschakelen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Volledig scherm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Volledig scherm aan-/uitzetten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Geluid" @@ -3525,58 +3866,44 @@ msgstr "Uitzoomen" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "schalen" -#: ../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 "De geografische lengtegraad bij de cursor." -#: ../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 "De naam van het object bij de cursor." -#: ../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 "De geografische breedtegraad bij de cursor." -#: ../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 "De hoek tussen het vorige en het huidige wegsegment." -#: ../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 "De (kompas)richting van het lijnsegment dat wordt getekend." -#: ../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 "De lengte van het nieuwe wegsegment dat wordt getekend." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(geen object)" -#: ../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 "laag niet in lijst." -#: ../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 "" - -#: ../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 "" @@ -3588,10 +3915,4 @@ msgid "File not found" msgstr "Bestand niet gevonden" - -#: ../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 @@ -3653,7 +3974,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" @@ -3669,5 +3989,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" @@ -3725,9 +4045,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" -msgstr "" +msgstr "Geen eigenschapsconflicten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" -msgstr "" +msgstr "Eigenschappen (met conflicten)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 @@ -3770,5 +4090,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 "Mijn versie" @@ -3779,5 +4099,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" @@ -3791,5 +4111,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 "Hun versie" @@ -3801,5 +4121,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 msgid "> top" -msgstr "" +msgstr "> boven" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 @@ -3809,5 +4129,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 msgid "> bottom" -msgstr "" +msgstr "> beneden" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 @@ -3849,5 +4169,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 msgid "Up" -msgstr "" +msgstr "Omhoog" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 @@ -3864,6 +4184,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" @@ -3877,5 +4197,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 msgid "Freeze" -msgstr "" +msgstr "Vastzetten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 @@ -3909,6 +4229,6 @@ msgid "My version ({0} entry)" msgid_plural "My version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Mijn versie ({0} invoer)" +msgstr[1] "Mijn versie ({0} invoeren)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 @@ -3916,6 +4236,6 @@ msgid "Merged version ({0} entry)" msgid_plural "Merged version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Samengevoegde versie ({0} invoer)" +msgstr[1] "Samengevoegde versie ({0} invoeren)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 @@ -3923,6 +4243,6 @@ msgid "Their version ({0} entry)" msgid_plural "Their version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hun versie ({0} invoer)" +msgstr[1] "Hun versie ({0} invoeren)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 @@ -3973,10 +4293,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 "" @@ -3985,19 +4305,19 @@ msgstr "" -#: ../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 "" @@ -4006,5 +4326,5 @@ msgstr "" -#: ../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 "" @@ -4022,9 +4342,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 " @@ -4032,110 +4352,112 @@ 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 "Coördinaten:" -#: ../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 "(geen)" -#: ../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 "verwijderd" -#: ../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 "niet verwijderd" -#: ../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 "Mijn coördinaten houden" -#: ../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 "Hun coördinaten houden" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4144,21 +4466,21 @@ msgstr "" -#: ../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 "Rol" #: ../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 "" @@ -4197,10 +4519,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 @@ -4209,10 +4532,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 @@ -4226,5 +4550,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}" @@ -4265,4 +4589,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "geen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "alles" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Kies een kleur" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "Parameter \"{0}\" mag niet leeg zijn." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 "niet verwijderd" + +#: ../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 "Nog niet geïmplementeerd." + +#: ../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 "vanaf weg" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Tegenstrijdigheden in de gegevens" + +#: ../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} weg" +msgstr[1] "{0} wegen" + +#: ../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} relatie" +msgstr[1] "{0} relaties" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Resolutie veranderen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Conflicten oplossen" + +#: ../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 "Plakken" + +#: ../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} weg" +msgstr[1] "{0} wegen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4278,10 +4739,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 @@ -4289,5 +4750,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}" @@ -4320,5 +4781,5 @@ #: ../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." @@ -4327,31 +4788,25 @@ "in de bovenstaande lijst." -#: ../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 "Opgeloste conflicten toepassen en dialoog sluiten" -#: ../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 "Doorgaan met oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4363,150 +4818,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 "Conflicten oplossen" -#: ../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 "Geschiedenis" -#: ../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 "De geschiedenis van alle geselecteerde items tonen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Laag: {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 "Relaties: {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 "" - -#: ../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 "Alle geselecteerde objecten herladen en de lijst verversen." #. 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 "Lagen" -#: ../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 "Een lijst met alle geladen lagen openen." -#: ../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 "De geselecteerde laag verwijderen." -#: ../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 "Laag verwijderen" - -#: ../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 "" - -#: ../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 "Tonen/Verbergen" -#: ../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 "Zichtbaarheid van een laag in- of uitschakelen." -#: ../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 "De geselecteerde laag een rij omhoog verplaatsen." -#: ../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 "De geselecteerde laag een rij omlaag verplaatsen." -#: ../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." @@ -4515,28 +4938,22 @@ msgstr[1] "Dit verandert {0} objecten." -#: ../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 "Een lege waarde verwijdert de sleutel." -#: ../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 "Waarden aanpassen?" -#: ../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" @@ -4545,89 +4962,84 @@ msgstr[1] "Eigenschappen van {0} objecten aanpassen" -#: ../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 "Selecteer een sleutel" -#: ../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 "Selecteer een waarde" -#: ../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 "Selecteer de objecten waarvan de eigenschappen moet veranderen." -#: ../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 "Eigenschappen/Lidmaatschappen" -#: ../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 "Eigenschappen voor geselecteerde objecten." #. 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 "Lid van" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Eigenschappen toevoegen" -#: ../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 "Toevoegen" -#: ../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 "Een nieuwe sleutel/waarde aan alle objecten toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Eigenschappen bewerken" -#: ../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 "De geselecteerde sleutelwaarde voor alle objecten bewerken" -#: ../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 "Eigenschappen: {0} / Leden: {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 "Eigenschappen / Leden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Relatie wijzigen" -#: ../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 "Selectie uit relatie {0} zeker verwijderen?" -#: ../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 "De geselecteerde sleutel in alle objecten verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Eigenschappen verwijderen" @@ -4636,34 +5048,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 "Relaties" -#: ../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 "Een lijst met alle relaties openen." -#: ../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 "Relaties: {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 "Een editor voor de geselecteerde relatie openen" -#: ../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 "De geselecteerde relatie verwijderen" -#: ../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 "Een nieuwe relatie aanmaken" -#: ../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 "" @@ -4696,23 +5108,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 "Selectie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} weg" -msgstr[1] "{0} wegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relatie" -msgstr[1] "{0} relaties" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4720,14 +5118,9 @@ msgstr "Selectie: {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 "Laat paneel drijven" -#: ../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." @@ -4736,64 +5129,96 @@ "werkbalk." -#: ../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 "Klik om de paneelinhoud te verkleinen/vergroten" -#: ../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 "Auteurs" -#: ../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 "Een lijst openen met mensen die aan de geselecteerde objecten werken." -#: ../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] "Auteur" +msgstr[1] "Auteur" + +#: ../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 +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 "Meer informatie over deze functionaliteit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Auteur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objecten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Auteurs: {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 "Tegenstrijdigheden in de gegevens" -#: ../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 "" @@ -4802,47 +5227,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 " @@ -4851,14 +5270,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 "" @@ -4868,9 +5287,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 "" @@ -4880,15 +5299,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4896,5 +5315,5 @@ msgstr "" -#: ../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 " @@ -4902,20 +5321,20 @@ msgstr "" -#: ../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 "" @@ -4924,57 +5343,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 "De geselecteerde leden omhoog verplaatsen" #. 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 "De geselecteerde leden omlaag verplaatsen" #. 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 " @@ -4983,9 +5402,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 "" @@ -4994,20 +5413,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 @@ -5017,37 +5432,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 "Alle incomplete wegen en daarbij behorende knopen downloaden" -#: ../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 "Leden downloaden" -#: ../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 "" @@ -5057,30 +5472,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 "" @@ -5094,22 +5509,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 "Vroege plugins laden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5142,34 +5562,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../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 "Voer eerst de gewenste coördinaten in." -#: ../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 "Voer een naam in voor de locatie." -#: ../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 "Selecteer eerst een bladwijzer." @@ -5227,13 +5634,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 "Nulwijzeruitzondering, mogelijk ontbreken er wat tags." -#: ../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 "Voer een zoekstring in" -#: ../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 "Kan locatiezoekresultaten van server niet lezen" @@ -5241,18 +5648,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 "Voer een plaats in om naar te zoeken:" -#. 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 "Locaties" #. 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 "naam" @@ -5291,37 +5697,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 "soort" -#: ../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 "nabij" -#: ../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 "zoom" -#: ../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: " @@ -5330,5 +5736,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 "Slippy-kaart" @@ -5355,46 +5761,74 @@ msgstr "Tegelnummers" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "De huidige voorkeuren naar de server uploaden" + +#: ../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}" +#: ../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 "Onverwacht token: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5713,14 +6147,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5896,8 +6344,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" #. @@ -5994,4 +6448,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6105,6 +6562,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 @@ -6112,153 +6569,171 @@ #: 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 "Naam" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Relatie wijzigen" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Meer informatie over deze functionaliteit" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Laatste verandering op {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6267,32 +6742,285 @@ msgstr "" -#: ../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 "Straatnaam" + +#: ../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 "Selecteer een waarde" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Parameter \"{0}\" mag niet leeg zijn." + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Negeer veranderingen en verlaat JOSM" + +#: ../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 "Sla op en verlaat JOSM" + +#: ../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 "laag" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Tijdens uploaden" + +#: ../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 "Bestand" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Herladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Afbeeldingen van {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 inlezen..." -#: ../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 "Geen tijd voor punt {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 "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." -#: ../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 "Geen afbeeldingen met een leesbare tijd gevonden." -#: ../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 @@ -6300,29 +7028,29 @@ msgstr "Lezen {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 "Geotagged afbeeldingen" -#: ../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-start: {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-einde: {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 "Huidige verschil: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "Tijdzoneverschil: " -#: ../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" @@ -6331,14 +7059,14 @@ msgstr[1] "afbeeldingen" -#: ../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} binnen de track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Klok synchroniseren" -#: ../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 @@ -6346,82 +7074,82 @@ msgstr "JPEG-afbeeldingen (*.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 "De datum in het bestand \"{0}\" kon niet ontleed worden." -#: ../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 "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Afbeelding" -#: ../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 "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" -#: ../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 "Tijdzone GPS-unit (verschil t.o.v. de foto)" -#: ../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 "Syncroniseer tijd met GPS-apparaat" -#: ../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 "Ingevoerde tijd kon niet worden ontleed." -#: ../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-punt" -#: ../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 "Lijntekening aanpassen" +#: ../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 "Algemene instellingen gebruiken." + #: ../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 "Algemene instellingen gebruiken." +msgid "Draw lines between points for this layer." +msgstr "Lijnen tussen punten in deze laag tekenen." #: ../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 "Lijnen tussen punten in deze laag tekenen." - -#: ../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 "Geen lijnen tussen punten in deze laag tekenen." -#: ../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 "Lijntekenopties selecteren" -#: ../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 "Kleur aanpassen" -#: ../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 "Standaard" -#: ../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" @@ -6481,5 +7209,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}" @@ -6495,10 +7223,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 "Naar gegevenslaag omzetten" #: ../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." @@ -6509,11 +7237,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 @@ -6555,4 +7283,9 @@ "verder
gaan?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Gegevens worden gedownload" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6575,64 +7308,64 @@ "kunnen schatten, zijn overgeslagen." -#: ../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 "Gegevenslaag {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 "buiten gedownload gebied" -#: ../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 "versie {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 "" -#: ../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} bestaat uit:" -#: ../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} verwijderd.)" -#: ../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-versie: {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 "Naar GPX-laag omzetten" -#: ../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" @@ -6640,5 +7373,5 @@ msgstr[1] "tracks" -#: ../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" @@ -6646,5 +7379,5 @@ msgstr[1] "Punten" -#: ../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" @@ -6653,5 +7386,5 @@ msgstr[1] "Een track met {0} punten" -#: ../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" @@ -6660,5 +7393,5 @@ msgstr[1] "{0} bestaat uit {1} tracks" -#: ../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" @@ -6667,9 +7400,9 @@ msgstr[1] "{0} punten" -#: ../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-marker" -#: ../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" @@ -6677,5 +7410,5 @@ msgstr[1] "markers" -#: ../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" @@ -6694,5 +7427,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}." @@ -6700,5 +7433,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 "Kan in de afgespeelde laag niet synchroniseren." @@ -6728,5 +7461,5 @@ msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." -#: ../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 " @@ -6736,5 +7469,5 @@ "geluidsopname afspeelde (na de eerste marker)." -#: ../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 " @@ -6744,29 +7477,29 @@ "of op het trackpunt waar je wilt synchroniseren." -#: ../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 "Kan nieuwe geluidsmarker niet aanmaken." -#: ../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 "Fout tijdens het tonen van de URL van deze marker" -#: ../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 "(URL was: " -#: ../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 "Fouten tijden tonen 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 "Uitgebreide voorkeuren" -#: ../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 "Voorkeuren direct instellen. Voorzichtig gebruiken!" -#: ../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 @@ -6774,26 +7507,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 "Huidige waarde is standaard." -#: ../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 "Standaardwaarde is ''{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 "Standaardwaarde is onbekend (instelling is nog niet gebruikt)." -#: ../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 "Selecteer een rij om te bewerken." -#: ../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 @@ -6801,14 +7534,14 @@ msgstr "Nieuwe waarde voor {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 "Selecteer een rij om te verwijderen." -#: ../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 "Nieuw sleutel/waardepaar invoeren" @@ -6948,40 +7681,40 @@ msgstr "Calibratie geluidsopname" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Kleur" -#: ../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 "Tekenstijl {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 "Laag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Kies" -#: ../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 "Selecteer een kleur voor {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 "Naar standaardwaarde zetten" -#: ../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 "Alles naar standaardwaarde zetten" -#: ../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 "Kleuren gebruikt door verschillende objecten in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Kleuren" @@ -7004,5 +7737,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 msgid "Force lines if no segments imported." -msgstr "Forceer lijnen indien er geen segmenten geïmporteerd zijn." +msgstr "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 @@ -7025,5 +7758,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Auto" @@ -7045,16 +7778,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 "Fiets" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7084,12 +7818,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 "Te voet" @@ -7276,5 +8010,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 "Opstartscherm tonen" @@ -7282,23 +8016,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 "Object-id in selectielijsten tonen" #: ../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 "Object-id in selectielijsten tonen" + +#: ../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 "Elastische hulplijn tekenen" -#: ../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 "" -#: ../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 "Object-id in selectielijsten tonen" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Weergave en Vormgeving" @@ -7330,54 +8075,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 "Beschikbare plugins configureren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Lijst downloaden" -#: ../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 "Update" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Sites configureren..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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 "Selecteer een invoer." +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Plugin-site configureren" #. 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 "Beeldscherminstellingen" -#: ../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 " @@ -7386,41 +8131,41 @@ "Verschillende instellingen die het uiterlijk van het programma beïnvloeden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Verbindingsinstellingen" -#: ../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 "Verbindingsinstellingen voor de OSM-server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Kaartinstellingen" -#: ../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 "Instellingen voor kaartprojectie en interpretatie van gegevens." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Geluidsinstellingen" -#: ../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 "Instellingen voor de geluidsspeler en geluidsmarkers." -#: ../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 "U dient JOSM opnieuw te starten om sommige instellingen te activeren." -#: ../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 "Coördinaten tonen als" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projectiemethode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Kaartprojectie" @@ -7453,12 +8198,4 @@ msgid "Proxy server password" msgstr "Wachtwoord proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "De basis-URL voor de OSM-server (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL-basisserver" #. 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 @@ -7485,61 +8222,60 @@ msgstr "Sneltoets" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "De rij om te kopiëren selecteren." -#: ../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 "" -#: ../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 "De geselecteerde bron uit de lijst verwijderen." -#: ../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 "" @@ -7731,36 +8467,59 @@ msgstr "Groepen aanpastoetsen" -#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Een nieuwe laag toevoegen" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "De geselecteerde laag verwijderen." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Meer informatie over deze functionaliteit" #. 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 "Optionele attributen:" -#: ../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 "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" -#: ../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 "Voorkeuze ''{0}'' gebruiken" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "afgesloten weg" -#: ../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 "Onbekend type: {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 @@ -7768,15 +8527,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {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 "Fout bij ontleden van {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 "Elementen van type {0} worden ondersteund." -#: ../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 @@ -7786,22 +8545,22 @@ msgstr[1] "{0} objecten wijzigen" -#: ../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 "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Eigenschappen veranderen" -#: ../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}''" @@ -7840,11 +8599,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 "Kan \"{0}\" niet lezen" -#: ../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 " @@ -7854,38 +8613,38 @@ "met een GPL-licentie." -#: ../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 "GPX-bestanden" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "GPS-trackomschrijving" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Voeg auteursinformatie toe" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Echte naam" -#: ../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 "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Voorgedefinieerd" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Jaar van copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Trefwoorden" @@ -7895,9 +8654,9 @@ msgstr "Exporteeropties" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exporteren en opslaan" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7908,10 +8667,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 "Kies een voorgedefineerde licentie" -#: ../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 @@ -7921,12 +8680,12 @@ msgstr "Markers van {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 "" -#: ../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" @@ -7947,6 +8706,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 @@ -7956,20 +8715,40 @@ msgstr "OSM-gegevens downloaden" -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7977,34 +8756,34 @@ msgstr "" -#: ../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-bestanden" -#: ../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 "Geïmporteerde coördinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Misvormde zinnen: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Controlegetalfouten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Onbekende zinnen: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Nulcoördinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA-import gelukt" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Importeren NMEA is mislukt!" @@ -8015,9 +8794,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8026,15 +8805,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8042,33 +8821,91 @@ msgstr "" -#: ../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 "Changeset openen" -#: ../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 "Changeset openen" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Changeset openen" + +#: ../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 "Changeset openen" + +#: ../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 "Changeset sluiten" -#: ../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 "Changeset sluiten" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Changeset openen" + +#: ../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 "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Uploaden..." -#: ../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}." @@ -8096,29 +8933,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Verkeerd wachtwoord of gebruikersnaam." -#: ../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 "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd." -#: ../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 "Gebruikersnaam en wachtwoord opslaan (onversleuteld)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Voer wachtwoord in" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Login" -#: ../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 "De basis-URL voor de OSM-server (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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." @@ -8126,13 +8967,17 @@ "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL-basisserver" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM-wachtwoord" -#: ../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." @@ -8141,20 +8986,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM Server bestanden" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8163,5 +9008,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8355,35 +9200,46 @@ "Kan niet met de OSM-server verbinden. Controleer je internetverbinding." -#: ../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} te gaan. Uploading {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} te gaan. Uploading {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} te gaan. Uploading {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 "Niets om te uploaden. Creëer eerst gegevens." + +#: ../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 "Plugins bijwerken" -#: ../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 "Plugins downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8396,5 +9252,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." @@ -8403,23 +9259,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8430,30 +9286,30 @@ msgstr "Een fout opgetreden in plugin {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 "" -#: ../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 "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen." -#: ../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 "Plugin niet gevonden: {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 "Laatste plugin-update is meer dan {0} dagen geleden." -#: ../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 " @@ -8463,21 +9319,21 @@ "via de configuratieoptie '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 "Plugin uitschakelen" -#: ../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 "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?" -#: ../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 " @@ -8487,5 +9343,5 @@ "rechten heeft om de bestaande plugins te overschrijven." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8495,10 +9351,10 @@ "\"-plugin." -#: ../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 "Volgens de informatie in de plugin, is de auteur {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." @@ -8507,9 +9363,9 @@ "fout rapporteert." -#: ../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 "Moet de plugin worden uitgeschakeld?" -#: ../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 " @@ -8519,13 +9375,13 @@ "uit de applicatie te halen." -#: ../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" @@ -8536,5 +9392,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" @@ -8543,18 +9399,18 @@ msgstr[1] "Plugin-informatie van {0} sites downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Geen plugin-informatie gevonden." -#: ../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 "" -#: ../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 "Alle geïnstalleerde plugins zijn bijgewerkt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8567,9 +9423,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 "Ontbrekende plugins downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8582,35 +9438,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}: versie {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 "Plugin gebundeld met 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 "Fout tijdens lezen plugin-informatiebestand: {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 "Dit is na het einde van de opname" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Fout tijdens afspelen van het geluid" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Niets doen" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Fout melden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8624,19 +9480,19 @@ "van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Er is een onverwachte fout opgetreden" -#: ../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 "Maak een melding bij {0}" +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +msgid "Include your steps to get to the error (as detailed as possible)!" +msgstr "" +"Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!" + #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 -msgid "Include your steps to get to the error (as detailed as possible)!" -msgstr "" -"Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8646,19 +9502,19 @@ "je de fout meldt." -#: ../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 "Voeg zeker de volgende informatie toe:" -#: ../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 "(De tekst is reeds gekopieerd naar je klembord.)" -#: ../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 "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen." -#: ../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 "" @@ -8667,5 +9523,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8674,5 +9530,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8685,5 +9541,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" @@ -8693,5 +9549,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8702,17 +9558,17 @@ "\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 "(Tip: je kunt sneltoetsen in Voorkeuren bewerken.)" -#: ../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 "" @@ -8721,4 +9577,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8743,9 +9634,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 "Spoor uploaden" -#: ../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 @@ -8753,27 +9662,40 @@ msgstr "Sporen uploaden" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Openbaar" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Indien geselecteerd wordt je spoor openbaar in 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 "Beschrijving" -#: ../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}" @@ -8781,47 +9703,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 "Verbinden..." -#: ../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 "Uploaden afgebroken" -#: ../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 "Uploaden is mislukt" -#: ../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-track is geupload" -#: ../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 "Upload is mislukt. Server gaf de volgende melding: " -#: ../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-track uploaden: {0}% ({1} van {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 "Geen beschrijving opgegeven. Voer deze s.v.p. in," -#: ../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 "Geen GPX-laag geselecteerd. Kan geen spoor uploaden." -#: ../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 "Geen gebruikersnaam opgegeven." -#: ../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 "Geen wachtwoord opgegeven." -#: ../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-track uploaden" @@ -8934,19 +9856,19 @@ msgstr "Verzameling afbeeldingen laden als een nieuwe laag." -#: ../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-bestanden (*.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 "Bestand {0} is geladen met de naam \"{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 "Fout tijdens ontleden {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." @@ -8958,34 +9880,34 @@ "een tijdzone
" -#: ../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 "Fototijd (uit 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-tijd (lees uit de bovenstaande foto): " -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "Ik bevind mij in tijdzone: " -#: ../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 "Geen datum" -#: ../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 "Open een andere foto" -#: ../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 "De tijd met een foto van de GPS-ontvanger synchroniseren" -#: ../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" @@ -8995,70 +9917,70 @@ "Gebruik de verwachte indeling a.u.b." -#: ../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 "Ongeldige datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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-track: " -#: ../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 "Een ander GPX-spoor openene" -#: ../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 "Tijdzone: " -#: ../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 "Verschuiving:" -#: ../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 "" "Ik kan een foto van mijn GPS-ontvanger maken.
Zou dat helpen?" -#: ../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 "Locatie bijwerken van: " -#: ../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 "Alle afbeeldingen" -#: ../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 "Afbeelding zonder EXIF-locatie" -#: ../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 "Nog niet getagde afbeeldingen" -#: ../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 "Verband tussen afbeeldingen en GPX-tracks leggen" -#: ../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 "Correleer" -#: ../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 "Automatisch schatten" -#: ../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 "U mag een GPX-track selecteren" -#: ../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 "Geen GPX-tracks geselecteerd" -#: ../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 "" @@ -9069,9 +9991,9 @@ "Verwachte indeling: {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 "Ongeldige tijdzone" -#: ../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 "" @@ -9082,26 +10004,26 @@ "Verwachte indeling: {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 "Ongeldige verschuiving" -#: ../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} overeenkomsten van {1} gevonden in GPX-track {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-track geladen" -#: ../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 "De selecteerde foto's bevatten geen tijdinformatie." -#: ../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 "Foto's bevatten geen tijdinformatie." -#: ../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." @@ -9109,39 +10031,39 @@ "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." -#: ../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-track heeft geen tijdinformatie" -#: ../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 "Tijdzone: {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 "Minuten: {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 "Seconden: {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} van de {1} foto's komen overeen met GPX-track." -#: ../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 "(Tijdverschil van {0} dagen)" -#: ../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 "" -#: ../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 " @@ -9149,13 +10071,13 @@ msgstr "" -#: ../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 "Koppelen van foto's aan track is mislukt" -#: ../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 "Tijdzone en tijdverschil aanpassen" -#: ../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 "Standaardwaarden" @@ -9176,5 +10098,5 @@ msgstr "Bestand {0} gaat fout" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9187,12 +10109,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 "Alles selecteren" - -#: ../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 "Laden bestand is mislukt" @@ -9221,8 +10142,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 "" "Stad/dorp {0} is niet gevonden of niet beschikbaar in WMS.\n" @@ -9233,21 +10154,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 "Gemeente selecteren" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Kies uit..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Kadaster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Automatisch vullen" -#: ../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" @@ -9256,37 +10177,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 "Oorspronkelijke achtergrond vervangen door achtergrondkleur van 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 "Grijstinten omkeren (voor zwarte achtergronden)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Achtergrond transparant maken." -#: ../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 "Grenzen van gedownloade gegevens tekenen" -#: ../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 "Automatisch bufferen inschakelen" -#: ../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 "Max. buffergrootte (in MB)" -#: ../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." @@ -9298,9 +10230,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "Franse kadaster 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 "" @@ -9308,10 +10240,10 @@ "ingeschakeld" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Bron" -#: ../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 " @@ -9321,5 +10253,5 @@ "in de JOSM-voorkeuren is opgegeven." -#: ../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). " @@ -9329,9 +10261,9 @@ "tekst op donkere achtergronden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Stapelen van meerdere lagen toestaan" -#: ../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 "" @@ -9339,34 +10271,32 @@ "doorzichtig." -#: ../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 "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen." #. 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 "Image-grab-vermenigvuldiger" - -#: ../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 "" "Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)" -#: ../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 "Vaste vierkant groote (standaard is 100m)" -#: ../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 "Vaste groote (van 25 tot 1000 meter)" -#: ../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 "Image-grab-vermenigvuldiger" - -#: ../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 "" @@ -9426,12 +10356,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Met WMS-server verbinden..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "afbeelding is niet geladen" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9465,20 +10393,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" @@ -9486,9 +10414,14 @@ 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 +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" @@ -9496,31 +10429,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 invoeren om naar toe te springen." - -#: ../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 "oost" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "noord" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Hun coördinaten houden" +msgid "Set " +msgstr "Selecteer" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9585,6 +10526,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)" @@ -9608,6 +10549,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 "Lege laag" @@ -9623,7 +10564,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Middelpunt raster: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10148,6 +11089,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 "water" @@ -10160,8 +11101,4 @@ msgid "land" msgstr "land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "geen" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10455,9 +11392,9 @@ msgstr "Downloadlus van 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-onderwerpen tonen" -#: ../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 " @@ -10466,5 +11403,5 @@ msgstr "" -#: ../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 "" @@ -11035,5 +11972,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 "Straatnaam" @@ -11052,29 +11989,29 @@ msgstr "Auteurspaneel tonen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Gebruikerspagina openen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Gebruikerspagina in browser openen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Gebruikers' gegevens selecteren" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Selectie vervangen door gegevens gebruiker" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Enkele gegevens selecteren a.u.b." -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Via het auteurspaneel een gebruiker kiezen" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Helaas, werkt niet voor anonieme gebruikers" @@ -11088,23 +12025,15 @@ msgstr "Overlappende gebieden samenvoegen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Toch doorgaan" - -#: ../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 "Op dit moment kunnen maximaal twee gebieden worden samengevoegd." -#: ../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}\" is niet gesloten en kan daarom niet worden samengevoegd." -#: ../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" @@ -11117,38 +12046,38 @@ "Weet je zeker dat je verder wilt gaan?" -#: ../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 "Breek af als je het niet zeker weet" -#: ../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 "Selecteer minstens één gesloten weg die samengevoegd moet worden." -#: ../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 " @@ -11158,33 +12087,33 @@ "of er geen fouten zijn geïntroduceerd." -#: ../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 "Naar positie springen" -#: ../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 "" @@ -11192,50 +12121,50 @@ "gesprongen." -#: ../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 invoeren om naar toe te springen." -#: ../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 "Je kunt ook een URL van www.openstreetmap.org inplakken." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (in metres)" -#: ../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 "Spring daarheen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Spring naar positie" -#: ../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 "" "Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Kan lat/lon niet ontleden." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Weg vereenvoudigen" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Ongebruikte knopen van een weg verwijderen." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Selecteer minimaal één weg om te vereenvoudigen." -#: ../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?" @@ -11248,25 +12177,25 @@ "vereenvoudigen?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Weet je het zeker?" -#: ../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 "Validatiefouten" -#: ../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 "Geen validatiefouten" -#: ../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 "Raster" -#: ../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 "" @@ -11357,53 +12286,53 @@ msgstr "Gegevensvalidatie uitvoeren" -#: ../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 "Gegevens met fouten. Toch uploaden?" -#: ../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 "Het validatiescherm openen." -#: ../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 "Op probleem inzoomen" -#: ../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 "Herstellen" -#: ../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 "De geselecteerde fouten herstellen." -#: ../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 "Negeren" -#: ../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 "De geselecteerde fouten de volgende keer negeren." -#: ../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 "Gehele groep" -#: ../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 "Individuele elementen" -#: ../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 "Niets" -#: ../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 "Gehele groep of individuele elementen negeren?" -#: ../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 "Elementen negeren" -#: ../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" @@ -11427,24 +12356,58 @@ #: ../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 "" "De test controleert of twee wegen, spoorwegen of waterwegen elkaar in " "dezelfde laag kruisen, terwijl ze niet door dezelfde knoop verbonden zijn." -#: ../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 "Gebouwen aanmaken" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Kruisende wegen" -#: ../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 "Dubbele knopen" -#: ../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 "" "Deze test controleert of er geen knopen met precies dezelfde locatie zijn." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Knopen met dezelfde naam" + +#: ../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 "Weg dupliceren" + +#: ../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 "" +"Deze test controleert of er geen knopen met precies dezelfde locatie zijn." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Weg dupliceren" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11533,24 +12496,24 @@ "gespeld zijn." -#: ../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 "Eigenschapchecker:" -#: ../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 "" "Deze plugin controleert op fouten in sleutels en waarden van eigenschappen." -#: ../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 "Ongeldige regel tagchecker - {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 "Ongeldige regel spellingschecker: {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 "" @@ -11561,7 +12524,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 "Ongeldige tag/waarde-combinaties" @@ -11569,81 +12532,81 @@ #. 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 "Tekenprobleem" -#: ../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 "Toets ''{0}'' is ongeldig." -#: ../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 "Tags met lege waarden" -#: ../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 "Ongeldige eigenschapsleutel" -#: ../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 "Ongeldige spatie in eigenschapsleutel" -#: ../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 "Eigenschapwaarde begin of eindigt met een spatie" -#: ../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 "Eigenschapwaarden bevatten HTML-codes" -#: ../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 "Sleutel \"{0}\" ontbreekt in voorkeuze." -#: ../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 "Voorkeuzen bevatten geen eigenschapsleutel" -#: ../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 "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze." -#: ../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 "Voorkeuzen bevatten geen eigenschapswaarde" -#: ../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 "Herstel-mij's" -#: ../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 "Eigenschapsleutels controleren." -#: ../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 "Valideer eigenschapsleutels met een woordenlijst" -#: ../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 "Uitgebreide eigenschapchecker gebruiken" -#: ../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 "" "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen." +#: ../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 "Tagcheckerbron" -#: ../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." @@ -11654,82 +12617,82 @@ "tagchecker." -#: ../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 "Nieuwe bron aan lijst toevoegen." -#: ../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 "De geselecteerde bron bewerken." -#: ../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 "Gegevensbronnen" -#: ../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 "Eigenschapwaarden controleren." -#: ../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 "Valideer eigenschapwaarden tegen presets" -#: ../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 "Controleer op herstel-mij's." -#: ../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 "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken." -#: ../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 "Controleer op tekenknopen." -#: ../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 "Controleer of kaarttekenen fouten heeft gevonden." -#: ../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 "Standaardgegevensbestand gebruiken." -#: ../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 "Het standaardgegevensbestand gebruiken (aanbevolen)." +#: ../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 "Standaardbestand spellingscontrole gebruiken." -#: ../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 "Het standaardbestand spellingscontrole gebruiken (aanbevolen)." -#: ../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 "Eigenschappen herstellen" -#: ../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 "Kan elementsoort niet vinden" -#: ../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 "Kan waarschuwingsniveau niet vinden" -#: ../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 "Ongeldige expressie ''{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}''" @@ -11874,7 +12837,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 "gebouw" @@ -11888,5 +12851,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 "gebied" @@ -12026,5 +12989,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Uitzondering opgetreden" @@ -12069,14 +13032,14 @@ msgstr "WMS-pluginhulp" -#: ../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 "Geogerefereerde afbeelding..." -#: ../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}" @@ -12087,26 +13050,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 "" -#: ../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 "" -#: ../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 " @@ -12114,37 +13077,55 @@ msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "WMS aanpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust the position of the selected WMS layer" msgstr "De positie van de geselecteerde WMS-laag aanpassen" -#: ../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 "" @@ -12160,15 +13141,43 @@ msgstr "Automatisch downloaden" -#: ../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 "bestemmingsverkeer" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../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-laag ({0}), in zoom {1} downloaden" -#: ../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 "Ongeldige datum" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12176,90 +13185,101 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../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-laag in bestand opslaan" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "WMS-laag uit bestand laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../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 "Een lege WMS-laag openen om gegevens uit een bestand in te laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Voorkeuren WMS-plugin" -#: ../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 "" "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond" -#: ../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 "Menunaam" -#: ../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-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Menunaam (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS-URL (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Een menunaam en WMS-URL invoeren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Standaardwaarde kopiëren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Selecteer minstens één weg." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12624,62 +13644,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 "Referentie" - -#. 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 "laag" #. item "Streets/Motorway" combo "Layer" @@ -12694,5 +13659,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 "Lanen" @@ -12707,5 +13672,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" @@ -12715,10 +13679,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 "Max. snelheid (km/u)" @@ -12762,9 +13726,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 "Éénrichtingsweg" @@ -12812,13 +13776,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 "Brug" @@ -12860,13 +13824,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 "Tunnel" @@ -12906,12 +13870,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 "Verdieping" @@ -12951,12 +13915,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 "Verhoging" @@ -13112,17 +14076,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 "Breedte (meters)" @@ -13149,4 +14113,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" @@ -13165,11 +14130,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 "Oppervlakte" @@ -13179,4 +14145,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" @@ -13191,9 +14158,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 "verhard" @@ -13201,10 +14169,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 "onverhard" + +#: 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 "Chalet" + +#: 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 "Verhuur" + +#. 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 "oerbos" + +#: 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 "parkeerbiljet" #. item "Ways/Track Grade 2" combo "Surface" @@ -13212,12 +14243,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 "kinderhoofdjes" + +#: 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 "gravel" + +#: 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 "kinderhoofdjes" + +#: 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 "onvolledig" + +#: 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 "gras" + +#: 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 "gras" + +#: 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 "zand" + +#. 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 "gebied" #. item "Streets/Residential" text "Width (meters)" @@ -13298,20 +14411,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Toegangsbeperkingen" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Toegangsbeperkingen bewerken" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Tol" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Doodlopende weg" @@ -13324,8 +14437,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 "Toegang" @@ -13360,32 +14473,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 "ja" @@ -13398,40 +14526,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 "privé" -#: 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 "bestemmingsverkeer" @@ -13444,19 +14572,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 "bestemming" @@ -13479,65 +14607,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 "toestemming" -#: 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 "landbouw" -#: 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 "nee" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Goederen" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Zwaar vrachtverkeer" @@ -13552,10 +14685,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 "Ruiters" @@ -13571,17 +14704,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 "Motorfiets" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13593,30 +14725,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 "Gemotoriseerd verkeer" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Openbaar vervoer" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorboot" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Pleziervaart" #. 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 "Min. snelheid (km/u)" @@ -13624,25 +14756,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 "Max. gewicht (tonnen)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. hoogte (meters)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. breedte (meters)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. lengte (meters)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rotonde" @@ -13653,5 +14785,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 "Een splitsing bewerken" @@ -13667,5 +14799,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" #. @@ -13673,9 +14805,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 "Soort" @@ -13695,10 +14827,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 "Autosnelweg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "op- en afrit autosnelweg" @@ -13720,10 +14852,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 "autoweg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "op- en afrit autoweg" @@ -13745,10 +14877,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 "provinciale weg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "op- en afrit provinciale weg" @@ -13770,5 +14902,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" @@ -13783,9 +14915,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "weg buiten bebouwde kom" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "niet geklassificeerd" @@ -13799,9 +14931,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "woongebied" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "woonerf" @@ -13831,10 +14963,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 "toegangsweg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "busbaan" @@ -13864,6 +14996,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 "werkzaamheden" @@ -13874,10 +15006,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 "Een brug bewerken" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Een tunnel bewerken" @@ -13885,19 +15017,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Wegen" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Werkzaamheden" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Een autosnelweg met werkzaamheden bewerken" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Splitsing" @@ -13913,5 +15045,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rotonde" @@ -13920,5 +15052,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Ruiterpad" @@ -13926,5 +15058,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Ruiterpad bewerken" @@ -13932,5 +15064,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Fietspad" @@ -13940,11 +15072,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 "Fietspad bewerken" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Voetgangers" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Voetpad" @@ -13953,11 +15091,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Voetpad bewerken" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pennen" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Voetgangers" @@ -13966,5 +15110,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Voetgangerszone bewerken" @@ -13972,5 +15116,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Trap" @@ -13980,5 +15124,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 "Trap bewerken" @@ -13987,5 +15131,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Track" @@ -13994,39 +15138,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Track bewerken" -#: 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 "gravel" - -#. 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 "gebied" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "gras" - -#: 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 "zand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Track (klasse 1)" @@ -14035,5 +15151,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Klasse-1-track bewerken" @@ -14041,5 +15157,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Track (klasse 2)" @@ -14048,5 +15164,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Klasse-2-track bewerken" @@ -14054,5 +15170,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Track (klasse 3)" @@ -14061,5 +15177,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Klasse-3-track bewerken" @@ -14067,5 +15183,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Track (klasse 4)" @@ -14074,5 +15190,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Klasse-4-track bewerken" @@ -14080,5 +15196,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Track (klasse 5)" @@ -14087,5 +15203,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Klasse-5-track bewerken" @@ -14094,5 +15210,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Pad" @@ -14101,19 +15217,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Pad bewerken" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Sneeuwscooter" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. 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 "Wandelen" @@ -14123,5 +15242,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 "Wandelen bewerken" @@ -14129,5 +15248,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Bergwandelen" @@ -14137,5 +15256,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 "Bergwandelen bewerken" @@ -14143,5 +15262,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Bergwandelen (stevig)" @@ -14151,5 +15270,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 "Bergwandelen (stevig) bewerken" @@ -14157,5 +15276,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Bergklimmen" @@ -14165,5 +15284,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 "Bergklimmen bewerken" @@ -14171,5 +15290,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Bergklimmen (stevig)" @@ -14179,5 +15298,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 "Bergklimmen (stevig) bewerken" @@ -14185,5 +15304,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Bergklimmen (moeilijk)" @@ -14193,5 +15312,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 "Bergklimmen (moeilijk) bewerken" @@ -14199,10 +15318,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Waypoints" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Snelwegkruising" @@ -14210,15 +15329,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Snelwegkruising bewerken" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Diensten" @@ -14226,5 +15345,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Rustplaats bewerken" @@ -14238,4 +15357,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" #. @@ -14255,18 +15376,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 "Bedrijf" @@ -14275,5 +15398,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Verkeerslicht" @@ -14283,5 +15406,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Soort voetgangersoversteekplaats" @@ -14290,27 +15413,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 "zonder verkeerslichten" -#: 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 "verkeerslichten" -#: 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 "eiland" -#: 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 "ongemarkeerd" #. 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 "Als ruiter oversteken" @@ -14318,6 +15441,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 "Op de fiets oversteken" @@ -14326,11 +15449,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 "Klaar-over" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "" @@ -14338,30 +15461,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 "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelicaan" -#: 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 "Stop" @@ -14369,5 +15492,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Voetgangersoversteekplaats" @@ -14376,14 +15499,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rotonde" @@ -14394,14 +15517,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 "Richting" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "met de klok mee" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Draaicirkel" @@ -14411,20 +15534,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 "Stadsgrens" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Bord stadsgrens bewerken" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Tweede naam" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Snelheidscamera" @@ -14432,5 +15555,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Praatpaal" @@ -14438,5 +15561,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14444,5 +15567,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14451,10 +15574,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Doorwaadplek" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Doorwaadplek bewerken" @@ -14462,5 +15585,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Bergpas" @@ -14468,5 +15591,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Bergpas bewerken" @@ -14474,11 +15597,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 "Stijging" @@ -14486,5 +15609,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barrières" @@ -14492,5 +15615,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Verkeerspaal" @@ -14498,5 +15621,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Verkeerspaal bewerken" @@ -14541,16 +15664,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 "Toegestaan verkeer:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "" @@ -14559,5 +15682,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Blok" @@ -14565,5 +15688,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Wildrooster" @@ -14571,10 +15694,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Wildrooster bewerken" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bussluis" @@ -14582,15 +15705,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pennen" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Spijkers bewerken" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Tolpoort" @@ -14598,5 +15721,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Tolpoort bewerken" @@ -14604,10 +15727,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Grenspost" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Grenspost bewerken" @@ -14617,5 +15740,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Haag" @@ -14624,5 +15747,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Hek" @@ -14631,5 +15754,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Muur" @@ -14637,5 +15760,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Stadsmuur" @@ -14644,5 +15767,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Stutmuur" @@ -14654,15 +15777,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Ingang" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Ingang bewerken" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Poort" @@ -14670,50 +15793,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Poort bewerken" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Slagboom" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Slagboom bewerken" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Draadhek" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Draadhek bewerken" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Botspoort" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Botspoort bewerken" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Sluipdoorhek" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Sluipdoorhek bewerken" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Overstap" @@ -14721,25 +15844,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Overstap bewerken" #. 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 "Gekoppelde deuren" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Gekoppelde deuren bewerken" @@ -14750,10 +15873,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 "Water" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Bron" @@ -14761,5 +15884,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Bron bewerken" @@ -14767,5 +15890,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Sloot" @@ -14773,10 +15896,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Sloot bewerken" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Stroom" @@ -14784,10 +15907,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Stroom bewerken" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanaal" @@ -14795,10 +15918,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Kanaal bewerken" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Rivier" @@ -14808,5 +15931,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 "Rivier bewerken" @@ -14814,15 +15937,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Water bewerken" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Land bewerken" @@ -14830,15 +15953,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Estuarium" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Estuarium bewerken" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Reservoir" @@ -14846,15 +15969,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Reservoir bewerken" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Ondergronds reservoir" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Ondergronds reservoir bewerken" @@ -14862,5 +15985,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Rivierbank" @@ -14869,10 +15992,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Rivierbank bewerken" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Drasland" @@ -14883,14 +16006,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 "Drasland bewerken" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Moeras" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "veen" @@ -14904,35 +16027,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "moeras" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "rietveld" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "Zoutwatermoeras" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "slik" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangroven" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Modder" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Modder bewerken" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Strand" @@ -14940,20 +16063,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Strand bewerken" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Baai" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Baai bewerken" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Klif" @@ -14961,10 +16084,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Klif bewerken" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Kustlijn" @@ -14972,5 +16095,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Kustlijn bewerken" @@ -14978,5 +16101,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Veerpontroute" @@ -14984,5 +16107,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Veerpontroute bewerken" @@ -14991,5 +16114,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Scheepswerf" @@ -14997,10 +16120,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Scheepswerf bewerken" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dok" @@ -15008,5 +16131,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Dok bewerken" @@ -15014,5 +16137,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Dam" @@ -15020,15 +16143,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Dam bewerken" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Waterwegpunt" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Sluis" @@ -15037,5 +16160,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Stuw" @@ -15043,20 +16166,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Stuw bewerken" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Waterval" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Waterval bewerken" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Zwaaiplaats" @@ -15065,15 +16188,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Jachthaven" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Jachthaven bewerken" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Pier" @@ -15081,10 +16204,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Pier bewerken" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Veerbootterminal" @@ -15092,10 +16215,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Veerbootterminal bewerken" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Trailerhelling" @@ -15105,5 +16228,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 "Trailerhelling bewerken" @@ -15111,10 +16234,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Spoorweg" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Spoor" @@ -15122,5 +16245,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Spoor bewerken" @@ -15150,8 +16273,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 "Optionele soorten" @@ -15165,35 +16288,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 "tuin" -#: 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 "nevenweg" -#: 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 "privéoprit" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Smalspoor" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Smalspoor bewerken" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15201,45 +16324,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Monorail bewerken" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Museumspoor" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Een museumspoorweg bewerken" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Sneltram" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Sneltram bewerken" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Metro bewerken" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tram" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Tram bewerken" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Busbaan" @@ -15247,5 +16370,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Busbaan bewerken" @@ -15254,14 +16377,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Ongebruikt spoor" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Ongebruikt spoor bewerken" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Verwijderd spoor" @@ -15270,5 +16393,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Bewaakte spoorwegovergang" @@ -15277,5 +16400,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Onbewaakte spporwegovergang" @@ -15285,5 +16408,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15291,5 +16414,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Draaiplateau" @@ -15298,10 +16421,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Kabelbaan" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Stoeltjeslift" @@ -15309,10 +16432,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Stoeltjeslift bewerken" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Sleeplift" @@ -15320,10 +16443,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Sleeplift bewerken" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Kabinebaan" @@ -15331,10 +16454,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Kabinebaan bewerken" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15342,5 +16465,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15348,5 +16471,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 "Station" @@ -15357,10 +16480,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 "Station bewerken" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Brandstof" @@ -15370,9 +16493,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 "Brandstof bewerken" #. 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 "Openingstijden" + +#. 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" @@ -15392,106 +16744,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Parkeerplaats bewerken" #. 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 "Referentienummer" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "meerlaags" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "oppervlak" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "ondergronds" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Parkeer en Reis" + +#. 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 "Parkeergeld" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Capaciteit" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Gehandicaptenplaats" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Gehandicaptenplaats" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Gehandicaptenplaats" + +#: 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 "Wasstraat" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Autowasstraat bewerken" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Winkel" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Winkel met autoonderdelen bewerken" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Garage" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Autogarage bewerken" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Verhuur" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Autoverhuur bewerken" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Autodelen" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Autodelen bewerken" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Fietsenstalling bewerken" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Capaciteit" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "oppervlak" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "meerlaags" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "ondergronds" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "Parkeer en Reis" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Gehandicaptenplaats" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Parkeergeld" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Wasstraat" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Autowasstraat bewerken" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Winkel" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Winkel met autoonderdelen bewerken" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Garage" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Autogarage bewerken" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Verhuur" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Autoverhuur bewerken" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Autodelen" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Autodelen bewerken" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Fietsenstalling bewerken" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Fietsenverhuur bewerken" @@ -15500,15 +16887,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Fietswinkel bewerken" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Openbaar vervoer" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-referentie" @@ -15516,5 +16903,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Onbemand station" @@ -15522,5 +16909,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Onbemand station bewerken" @@ -15528,5 +16915,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tramhalte" @@ -15535,5 +16922,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Tramhalte bewerken" @@ -15541,5 +16928,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Perron" @@ -15548,5 +16935,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Perron bewerken" @@ -15558,5 +16945,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 "Referentie (tracknummer)" @@ -15564,10 +16951,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 "Gebied" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Metroingang" @@ -15576,10 +16963,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Metroingang bewerken" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rolstoel" @@ -15588,5 +16975,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busstation" @@ -15595,5 +16982,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Busstation bewerken" @@ -15601,5 +16988,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bushalte" @@ -15609,5 +16996,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 "Bushalte bewerken" @@ -15616,8 +17003,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 "Schuilplaats" @@ -15625,10 +17010,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Busstation" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Busplatform bewerken" @@ -15636,5 +17021,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15642,5 +17027,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Taxistandplaats bewerken" @@ -15648,5 +17033,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Luchthaven" @@ -15654,15 +17039,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15671,5 +17056,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Accomodatie" @@ -15681,5 +17066,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -15688,15 +17073,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Hotel bewerken" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Sterren" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -15704,20 +17089,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Motel bewerken" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Pension" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Pension bewerken" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Chalet" @@ -15725,10 +17110,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Chalet bewerken" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Hostel" @@ -15736,30 +17121,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Hostel bewerken" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Berghut" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Berghut bewerken" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Caravanpark" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Caravanpark bewerken" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Kampeerterrein" @@ -15767,10 +17152,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Kampeerterrein bewerken" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Eten en drinken" @@ -15781,5 +17166,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -15787,5 +17172,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Restaurant bewerken" @@ -15793,5 +17178,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 "Keuken" @@ -15799,61 +17184,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 "Italiaanse keuken" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "Chinese keuken" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "Grieks" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "Duits" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "Indiaas" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "lokaal" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "Kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "Turks" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "Oosters" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "Thais" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "Mexicaans" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "Japans" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fast Food" @@ -15861,9 +17246,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Fast-Food-restaurant bewerken" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Café" @@ -15871,10 +17256,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Café bewerken" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Kroeg" @@ -15882,20 +17266,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Kroeg bewerken" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Biergarten bewerken" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "" @@ -15903,10 +17285,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 "Nachtclub" @@ -15914,33 +17295,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Nachtclub bewerken" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Toerisme" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attractie" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Attractie bewerken" -#. 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 "Openingstijden" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -15948,10 +17320,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Museum bewerken" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Dierentuin" @@ -15960,10 +17331,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Dierentuin bewerken" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Uitkijkpunt" @@ -15971,25 +17341,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Uitkijkpunt bewerken" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Uitkijktoren" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Themapark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Themapart bewerken" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Kunstwerk" @@ -15997,5 +17366,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Kunstwerk bewerken" @@ -16003,86 +17372,210 @@ #. 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 "Kaart" #. 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 "kaart" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "stadskaart" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "wandelkaart" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "fietskaart" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. 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 "straat" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "Chinese keuken" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Gebied downloaden" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Plakken" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Stad" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "lokaal" #. 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 "Fietsen" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Bergwandelen" + +#. 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 "Skiën" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "nevenweg" + +#. 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 "bord" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Grenspost" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "beginner" + +#: build/trans_presets.java:1737 msgid "history" msgstr "geschiedenis" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "natuur" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "Wild" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "grondgebruik" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Informatie" + +#. 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 "GPS-trackomschrijving" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Geluid" + +#. +#: 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 "Telefoonnummer" + +#. 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 "Schuilplaats bewerken" @@ -16090,25 +17583,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 "Vuurplaats" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Picnicplek" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Picnicplek bewerken" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historische locaties" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Kasteel" @@ -16117,20 +17610,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Kasteel bewerken" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruïne" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Ruïne bewerken" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Archeologische plaats" @@ -16139,10 +17631,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Archeologische plaats bewerken" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Slagveld" @@ -16150,5 +17641,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Slagveld bewerken" @@ -16156,15 +17647,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Monument bewerken" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Herdenkingsplek" @@ -16172,45 +17663,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Herdenkingsplek bewerken" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Kruis langs de weg" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Kruis langs de weg bewerken" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Kapelletje langs de weg" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Kapelletje bewerken" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Vrije tijd" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Zwembad" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Zwembad bewerken" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Speelveld" @@ -16218,15 +17709,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Speelveld bewerken" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Visstek" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Visstek bewerken" @@ -16234,15 +17725,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sportfaciliteiten" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Stadion bewerken" @@ -16256,6 +17747,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 "sport selecteren:" @@ -16647,30 +18138,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 "sport" @@ -16680,227 +18171,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 "Meervoudig" -#: 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 "Boogschieten" -#: 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 "Atletiek" -#: 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 "Australisch football" -#: 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 "Honkbal" -#: 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 "Basketball" -#: 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 "Boules" -#: 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 "Bowling" -#: 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 "Kanoën" -#: 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 "Klimmen" -#: 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 "Cricket" -#: 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 "Cricket netten" -#: 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 "Croquet" -#: 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 "Fietsen" -#: 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 "Hondenraces" -#: 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 "Paardensport" -#: 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 "Football" -#: 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 "Golf" -#: 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 "Turnen" -#: 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 "Hockey" -#: 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 "Paardenraces" -#: 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 "Motorsport" -#: 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 "Pelota" -#: 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 "Badminton" -#: 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 "Rugby" -#: 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 "Schieten" -#: 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 "Skateboarden" -#: 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 "Schaatsen" -#: 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 "Skiën" -#: 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 "Voetbal" -#: 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 "Zwemmen" -#: 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 "Tafeltennis" -#: 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 "Tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sportcentrum" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Sportcentrum bewerken" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Sportveld" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Sportveld bewerken" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Wedstrijdbaan" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Wedstrijdbaan bewerken" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfbaan" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Golfbaan bewerken" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Minigolf bewerken" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Verzameling" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Verzameling bewerken" @@ -16939,248 +18428,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 "Sportveld" -#: 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 "Sportcentrum" -#: 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 "Stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletiek" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Atletiek bewerken" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Boogschieten" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Boogschieten bewerken" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klimmen" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Klimmen bewerken" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kanoën" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Kanoën bewerken" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Fietsen" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Fietsen bewerken" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Hondenracen" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Hondenracen bewerken" -#: 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 "Paardenracen" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Paardenracen bewerken" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Turnen" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Turnen bewerken" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorracen" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Motorracen bewerken" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Schaatsen" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Schaatsen bewerken" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Skateboard bewerken" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Zwemmen" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Zwemmen bewerken" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Skiën" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Skiën bewerken" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Soort piste" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "bergafwaarts" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "Scandinavisch" -#: 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 "Moeilijkheidsgraad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "beginner" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "eenvoudig" -#: 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 "expert" -#: 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 "Schieten" @@ -17188,178 +18669,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Schieten bewerken" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Balsporten" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Voetbal" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Voetbal bewerken" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Football" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Football bewerken" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australisch football" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Australisch football bewerken" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Honkbal" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Honkbal bewerken" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Basketball bewerken" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Golf bewerken" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golfbaan" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Boule bewerken" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowlen" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Bowlen bewerken" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Cricket bewerken" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricketnetten" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Cricketnetten bewerken" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Croquet bewerken" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Hockey bewerken" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Pelota bewerken" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Badminton" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Badminton bewerken" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Rugby bewerken" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Tafeltennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Tafeltennis bewerken" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Tennis bewerken" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Gebouwen" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Gebouw" @@ -17367,5 +18848,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Openbare gebouw" @@ -17373,10 +18854,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Openbare gebouwen bewerken" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Stadhuis" @@ -17384,10 +18865,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Stadhuis bewerken" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassade" @@ -17395,10 +18876,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Ambassade bewerken" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Gerechtsgebouw" @@ -17407,10 +18888,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Gerechtsgebouw bewerken" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Gevangenis" @@ -17419,10 +18900,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Gevangenis bewerken" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Politie" @@ -17432,10 +18913,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 "Politie bewerken" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Brandweerkazerne" @@ -17444,10 +18925,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Brandweerkazerne bewerken" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postkantoor" @@ -17455,5 +18936,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Postkantoor bewerken" @@ -17461,15 +18942,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Kinderopvang" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Kinderopvang bewerken" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "School" @@ -17477,10 +18958,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "School bewerken" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universiteit" @@ -17488,10 +18969,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Universiteit bewerken" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Campus" @@ -17499,5 +18980,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Campus bewerken" @@ -17505,5 +18986,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Bioscoop" @@ -17512,10 +18993,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Bioscoop bewerken" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliotheek" @@ -17524,10 +19005,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Bibliotheek bewerken" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Kunstcentrum" @@ -17535,10 +19015,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Kunstcentrum bewerken" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Theater" @@ -17547,10 +19027,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Theater bewerken" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Religieus gebouw" @@ -17560,5 +19040,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 "Religieus gebouw bewerken" @@ -17567,6 +19047,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 "Religie" @@ -17575,66 +19055,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 "Bahai" -#: 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 "Boeddhisme" -#: 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 "Christelijk" -#: 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 "Hindoestaans" -#: 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 "Jain" -#: 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 "Joods" -#: 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 "Moslim" -#: 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 "Sikh" -#: 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 "Spirtualist" -#: 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 "Taoist" -#: 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 "Benaming" @@ -17643,81 +19123,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 "Anglicaan" -#: 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 "Baptist" -#: 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 "Katholiek" -#: 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 "Evangelist" -#: 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 "Jehovahs getuigen" -#: 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 "Luthers" -#: 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 "Methodist" -#: 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 "Mormoon" -#: 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 "Orthodox" -#: 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 "Protestant" -#: 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 "Quaker" -#: 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 "Adressen" @@ -17726,5 +19206,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Adresinformatie bewerken" @@ -17732,5 +19212,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Huisnummer" @@ -17738,20 +19218,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Huisnaam" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Stadsnaam" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postcode" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Landcode" @@ -17759,5 +19239,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Adresinterpolatie" @@ -17766,5 +19246,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Adresinterpolatie bewerken" @@ -17772,71 +19252,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Nummeringschema" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "oneven" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "even" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "alles" - -#: 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 "Bouwwerken" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabriek" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Fabriek bewerken" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Toren" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Toren bewerken" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Watertoren" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Watertoren bewerken" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Olieopslag" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Olieopslag bewerken" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Vuurtoren" @@ -17844,10 +19320,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Vuurtoren bewerken" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Windmolen" @@ -17855,10 +19331,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Windmolen bewerken" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Pijplijn" @@ -17866,10 +19342,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Pijplijn bewerken" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Afvalzuivering" @@ -17879,10 +19355,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 "Afvalzuivering bewerken" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Kraan" @@ -17890,10 +19366,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Kraan bewerken" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Baken" @@ -17901,10 +19377,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Baken bewerken" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Uitkijkpunt" @@ -17912,10 +19388,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Uitkijkpunt bewerken" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Bewakingscamera" @@ -17923,5 +19399,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Bewakingscamera bewerken" @@ -17929,5 +19405,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Energievoorziening" @@ -17937,39 +19413,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 "Energievoorziening bewerken" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "water" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossiele brandstoffen" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nucleair" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kolen" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "fotovoltage" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Verdeelstation" @@ -17978,10 +19454,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Verdeelstation bewerken" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -17990,5 +19466,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Transformatorstation bewerken" @@ -17996,10 +19472,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 "Lijnreferentie" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Hoogspanningsmast" @@ -18010,5 +19486,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 "Hoogspanningsmast bewerken" @@ -18016,5 +19492,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Hoogspanningskabel" @@ -18023,46 +19499,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Hoogspanningskabels bewerken" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Voltage" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Hoeveelheid draden" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Voorzieningen" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toiletten" -#. 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 "Referentienummer" - #. 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 "Opmerking" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Postbus" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefoon" @@ -18071,5 +19541,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Een telefoon bewerken" @@ -18077,5 +19547,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 "Munten" @@ -18083,5 +19553,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 "Briefgeld" @@ -18089,5 +19559,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 "Chipknip" @@ -18095,5 +19565,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 "Pinpas" @@ -18101,15 +19571,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 "Creditkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefoonkaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recycling" @@ -18118,5 +19588,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Recyclebakken" @@ -18124,80 +19594,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterijen" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Flessen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Kleding" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Schroot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Bank" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Vogeluitkijkpost" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Vogeluitkijkpost bewerken" -#. 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 "Hoogte" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "Kruiphoogte" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "Bukhoogte" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "Stahoogte" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Verborgen" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Afgesloten" -#. 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 "Hoogte" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "Kruiphoogte" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "Bukhoogte" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "Stahoogte" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontein" @@ -18206,10 +19672,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Fontein bewerken" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Drinkwater" @@ -18218,10 +19684,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Drinkwater bewerken" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -18229,25 +19695,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 "Winkels" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarkt" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Supermarkt bewerken" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Chalet" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Chalet bewerken" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "" @@ -18255,10 +19731,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 "Kiosk" @@ -18266,10 +19741,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Kiosk bewerken" -#. 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 "Bushalte bewerken" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Boom bewerken" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Verkoopautomaat" @@ -18277,5 +19771,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Verkoopautomaat bewerken" @@ -18283,88 +19777,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Producten" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "vervoerskaarten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "overzichtskaart" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parkeerbiljet" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "voedsel" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "frisdranken" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "snoepgoed" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "sigaretten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "foto's" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "diervoeder" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "kranten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "speelgoed" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "postzegels" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kaarten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "prepaid-kaarten" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "tegoedbonnen" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "condooms" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "hondenpoepzakjes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Klantenkaarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Slager" @@ -18372,10 +19866,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Slager bewerken" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Bakker" @@ -18383,10 +19876,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Bakker bewerken" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Bloemist" @@ -18394,20 +19886,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Bloemist bewerken" -#. 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 "" @@ -18415,60 +19905,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 "Dranken" #. 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 "Computer" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Computerwinkel bewerken" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronica" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Elektronicawinkel bewerken" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Hifi-winkel bewerken" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Meubels" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Meubelzaak bewerken" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Tuincentrum" @@ -18476,10 +19960,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Tuincentrum bewerken" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "" @@ -18487,10 +19970,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 "Doe-het-zelfzaak" @@ -18498,60 +19980,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Doe-het-zelfzaak bewerken" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Kantoorartikelen" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Kantoorartikelenwinkel bewerken" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Kapper" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Kapper bewerken" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Schoenen" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Schoenenwinkel bewerken" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Speelgoed" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Speelgoedwinkel bewerken" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Videotheek" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Videotheek bewerken" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Stomerij" @@ -18559,10 +20035,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Stomerij bewerken" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Wasserette" @@ -18570,10 +20045,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Wasserette bewerken" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Buitensport" @@ -18581,35 +20055,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Buitensportzaak bewerken" -#. 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 "Sportzaak bewerken" -#. 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 "Opticiën bewerken" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Geldzaken" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -18617,16 +20088,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Bank bewerken" -#. 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 "Geldautomaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Geldwisselkantoor" @@ -18634,5 +20103,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Geldwisselkantoor bewerken" @@ -18640,15 +20109,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Geldautomaat bewerken" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Gezondheid" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Huisarts" @@ -18656,20 +20125,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Huisarts bewerken" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Tandarts" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Tandarts bewerken" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apotheek" @@ -18677,5 +20144,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Apotheek bewerken" @@ -18683,10 +20150,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 "Ziekenhuis" @@ -18694,10 +20160,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Ziekenhuis bewerken" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "EHBO-post" @@ -18706,5 +20172,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "EHBO-post bewerken" @@ -18713,20 +20179,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Puntnummer" #. 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 "Telefoonnummer" #. 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 "(Gebruik de landtoegangscode, b.v. +31 20-3456789)" @@ -18734,5 +20200,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 "Dierenarts" @@ -18741,55 +20207,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Dierenarts bewerken" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Een continent bewerken" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Land bewerken" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Provincie" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Provincie bewerken" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Regio" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Regio bewerken" #. 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 "" @@ -18797,15 +20263,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Stad" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Stad bewerken" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Dorp" @@ -18813,10 +20279,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Dorp bewerken" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Deelgemeente" @@ -18824,25 +20290,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Deelgemeente bewerken" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Klein dorp" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Klein dorp bewerken" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Gehucht" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Gehucht bewerken" @@ -18850,5 +20316,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18856,10 +20322,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 "Eiland" @@ -18867,11 +20333,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Eiland bewerken" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "links" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Chalet bewerken" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Grotingang" @@ -18879,10 +20358,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Grotingang bewerken" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Bergtop" @@ -18890,10 +20369,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Bergtop bewerken" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Gletsjer" @@ -18901,10 +20380,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Gletsjer bewerken" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkaan" @@ -18912,70 +20391,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Vulkaan bewerken" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Landsgrens" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Landsgrens bewerken" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Provincie -of gemeentegrens" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Provincie -of gemeentegrens bewerken" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Grens bebouwde kom" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Grens bebouwde kom bewerken" #. 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 "Grens kiesdistrict bewerken" #. 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 "Grens Nationaal park bewerken" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Grondgebruik" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Boom" @@ -18984,15 +20463,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Boom bewerken" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanische naam" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Bos" @@ -19001,5 +20480,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Bos bewerken" @@ -19007,17 +20486,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 "naaldbomen" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "loofbomen" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "gemengd" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Bosbouw" @@ -19026,14 +20505,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Bosbouw bewerken" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Natuurreservaat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Natuurreservaat bewerken" @@ -19041,25 +20520,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Puinhelling" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Puinhelling bewerken" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Kreupelhout" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Kreupelhout bewerken" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "" @@ -19067,10 +20546,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 "Heide" @@ -19078,5 +20557,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Heide bewerken" @@ -19084,5 +20563,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Boerenerf" @@ -19091,45 +20570,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Boerenerf bewerken" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Landbouwgrond" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Landbouwgrond bewerken" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Weide" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Weideland bewerken" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Wijngaard" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Wijngaard bewerken" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Volkstuinen" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Volkstuinen bewerken" @@ -19137,25 +20616,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Tuin" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Tuin bewerken" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Gras" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Gras bewerken" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Stadsgroen" @@ -19163,10 +20642,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Stadsgroen bewerken" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Algemeen" @@ -19174,20 +20653,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Algemeen bewerken" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Park bewerken" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Recreatiegebied" @@ -19195,5 +20674,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Recreatiegebied bewerken" @@ -19201,15 +20680,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Woongebied" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Woongebied bewerken" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Begraafplaats" @@ -19217,9 +20696,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Begraafplaats" @@ -19227,39 +20706,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Winkelcentrum" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Winkelcentrum bewerken" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Kantoren" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Kantoren bewerken" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industrieterrein" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Industrieterrein bewerken" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "" @@ -19267,15 +20746,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 "Militair terrein" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Militair terrein bewerken" @@ -19283,55 +20762,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Bouwterrein" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Bouwterrein bewerken" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Braakliggende grond" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Braakliggende grond bewerken" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Ontwikkelingsgebied" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Ontwikkelingsgebied bewerken" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Vuilstortplaats" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Vuilstortplaats bewerken" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Mijnbouw" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Mijnbouw bewerken" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygoon" @@ -19341,5 +20820,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 "Multipolygoon bewerken" @@ -19348,10 +20827,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "buitensegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "binnensegment" @@ -19359,5 +20838,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Verkeersbeperking" @@ -19366,5 +20845,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Verkeersbeperking bewerken" @@ -19372,34 +20851,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Beperking" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "niet linksaf" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "niet rechtsaf" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "niet rechtdoor" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "niet keren" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "alleen rechtsaf" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "alleen linksaf" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "alleen rechtdoor" @@ -19408,15 +20887,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "vanaf weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "via knoop of weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "naar weg" @@ -19424,5 +20903,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19431,5 +20910,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19437,5 +20916,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19507,5 +20986,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 @@ -19514,17 +20993,17 @@ msgstr "fiets" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "bus" -#: 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 "" @@ -19577,5 +21056,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 @@ -19584,13 +21063,13 @@ msgstr "voet" -#: 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 "" @@ -19604,10 +21083,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "" @@ -19615,31 +21094,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 "" @@ -19648,30 +21127,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 "" @@ -20109,11 +21588,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 "vervallen" @@ -20439,41 +21918,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 "straat" #. color street @@ -22174,5 +23616,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 "licht_water" @@ -22771,55 +24213,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22833,5 +24226,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 "toerisme" @@ -22903,8 +24296,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 "historisch" @@ -22975,8 +24368,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 "groen" @@ -22990,5 +24383,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "mijnbouw" @@ -23002,5 +24395,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "vuilstortplaats" @@ -23022,5 +24415,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "estuarium" @@ -23034,5 +24427,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "bosbouw" @@ -23046,5 +24439,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "landbouwgrond" @@ -23067,5 +24460,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "winkelcentrum" @@ -23079,5 +24472,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industrieel" @@ -23091,5 +24484,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "braakliggend gebied" @@ -23103,5 +24496,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "ontwikkelingsgebied" @@ -23115,5 +24508,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "Rangeerterrein" @@ -23170,7 +24563,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 "militair gebruik" @@ -23184,5 +24577,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "begraafplaats" @@ -23195,5 +24588,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "berg of -heuveltop" @@ -23208,5 +24601,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "gletsjer" @@ -23220,5 +24613,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulkaan" @@ -23273,8 +24666,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 "Natuurlijk" @@ -23288,5 +24681,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "ruig land" @@ -23300,20 +24693,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "heide" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "oerbos" - #. color water #. 1 @@ -23324,5 +24705,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "slikgronden" @@ -23336,5 +24717,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "strand" @@ -23412,8 +24793,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 "route" @@ -23461,7 +24842,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 "grens" @@ -23603,10 +24984,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 "plaats" @@ -23654,6 +25044,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 "adres" @@ -23950,9 +25340,61 @@ msgstr "" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Tableau d'Assemblage selecteren" - -#~ msgid "Not implemented yet." -#~ msgstr "Nog niet geïmplementeerd." +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe " +#~ "gegevens naar de server." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer " +#~ "dit als fout a.u.b." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Geen document geopend, dus ook niets om op te slaan." + +#~ msgid "Delete {1} {0}" +#~ msgstr "{1} {0} verwijderen" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan voorkeurenmap niet openen: {0}" + +#~ msgid "Delete Layer" +#~ msgstr "Laag verwijderen" + +#~ msgid "Authors: {0}" +#~ msgstr "Auteurs: {0}" + +#~ msgid "Public" +#~ msgstr "Openbaar" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden." + +#~ msgid "Continue anyway" +#~ msgstr "Toch doorgaan" + +#~ msgid "map" +#~ msgstr "kaart" + +#~ msgid "citymap" +#~ msgstr "stadskaart" + +#~ msgid "hikingmap" +#~ msgstr "wandelkaart" + +#~ msgid "bicyclemap" +#~ msgstr "fietskaart" + +#~ msgid "board" +#~ msgstr "bord" #~ msgid "position" @@ -24365,4 +25807,7 @@ #~ msgstr "Onjuiste projectie" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Tableau d'Assemblage selecteren" + #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 17484) +++ /applications/editors/josm/i18n/po/pl.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 17:43+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:13+0000\n" "Last-Translator: Łukasz Jernaś \n" "Language-Team: Polish \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -23,74 +23,77 @@ "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\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 "Przygotowywanie interfejsu użytkownika" #. 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 "Pomoc" -#: ../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 "Projekcja {0} nie może zostać aktywowana. Używam Mercatora." -#: ../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 @@ -100,155 +103,161 @@ #: ../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 "Błąd" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer." - -#: ../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] "Zmiany nie zostały zapisane. Odrzucić je?" +msgstr[1] "Zmiany nie zostały zapisane. Odrzucić je?" +msgstr[2] "Zmiany nie zostały zapisane. Odrzucić je?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Niezapisane zmiany" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Zmiany nie zostały zapisane. Odrzucić je?" - -#: ../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 "Zapisz i wyjdź" -#: ../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 "Porzuć i wyjdź" -#: ../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 "Anuluj" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{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 "Uwaga" -#: ../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 "Pominięto niepoprawny URL do pliku: \"{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 "Nie mogę czytać pliku ''{0}''. Komunikat błędu:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -273,7 +282,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" @@ -311,5 +321,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" @@ -333,6 +343,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 "Wtyczki" @@ -347,17 +357,26 @@ #: ../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 "" "UWAGA: nieoczekiwany format bazowego URL API. Przekierowanie do historycznej " "strony OSM prawdopodobnie zawiedzie. Bazowy URL API to: \"{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 "" +"UWAGA: nieoczekiwany format bazowego URL API. Przekierowanie do historycznej " +"strony OSM prawdopodobnie zawiedzie. Bazowy URL API to: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Proszę wybrać conajmniej jeden węzeł, drogę lub relację" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -366,5 +385,5 @@ msgstr "" -#: ../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 "Proszę, wybierz warstwę docelową." @@ -374,11 +393,11 @@ msgstr "Wybierz warstwę docelową" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Połącz" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -387,5 +406,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 "Brak warstw docelowych." @@ -402,11 +421,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 @@ -435,5 +454,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 "Szerokość" @@ -442,30 +461,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 "Długość" +#: ../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 "Wyrównaj węzły na kole" -#: ../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 "Przesuwa wybrane węzły tak, aby tworzyły koło." -#: ../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 @@ -479,6 +498,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 @@ -486,58 +505,57 @@ msgstr "Narzędzie: {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 "Wybierz co najmniej cztery węzły." #. 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 "Informacje" #. 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 "Wyrównaj węzły wzdłuż prostej" -#: ../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 "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." -#: ../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 "Wybierz co najmniej trzy węzły." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -548,10 +566,10 @@ "zmian to {0} z możliwych {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 "Naruszenie możliwości API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -560,5 +578,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -567,46 +585,46 @@ msgstr "" -#: ../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} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "dane" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "warstwa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "zaznaczenie" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "pobrany obszar" +#: ../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 "Pokaż {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 "Powiększ aby pokazać: {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 @@ -616,22 +634,22 @@ msgstr "Widok: {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 "Brak zaznaczenia, które można pokazać" -#: ../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 "Brak konfliktów, które można pokazać" +#: ../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 "Połącz drogi" -#: ../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 "Łączy kilka dróg w jedną." -#: ../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 "Wybierz co najmniej dwie drogi do połączenia." @@ -642,4 +660,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Połącz mimo tego" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -647,19 +669,7 @@ msgstr "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Połącz mimo tego" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Zmienić kierunek?" - -#: ../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 "" -"Drogi nie mogą być połączone jeżeli są skierowane tak jak obecnie. Czy " -"zmienić kierunek niektórych dróg?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -667,27 +677,34 @@ msgstr "Odwróć i połącz" -#: ../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 "" +"Drogi nie mogą być połączone jeżeli są skierowane tak jak obecnie. Czy " +"zmienić kierunek niektórych dróg?" + +#: ../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 "Podaj wartości dla wszystkich konfliktów." -#: ../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 "Rozwiąż konflikty" -#: ../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 "Połącz {0} dróg" -#: ../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 "Wszystkie trasy są puste" -#: ../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 " @@ -697,32 +714,32 @@ "węzłów)" +#: ../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 "Kopiuj" -#: ../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 "Kopiuje zaznaczone obiekty do schowka." -#: ../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 "Proszę wybrać coś do skopiowania." +#: ../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 "Utwórz okrąg" -#: ../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 "Tworzy okrąg na podstawie trzech zaznaczonych węzłów." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -734,20 +751,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 "Usuń" @@ -757,26 +774,26 @@ msgstr "Usuwa wybrane obiekty" -#: ../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 "Zastąp" -#: ../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 "Plik istnieje. Nadpisać?" #. 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 "Rozmieść węzły" -#: ../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 "" @@ -784,60 +801,61 @@ "jednej linii." +#: ../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 "Pobierz z 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 "Pobiera dane mapy z serwera 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 "Plik: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Pobieranie" -#: ../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 "Należy wybrać przynajmniej jeden element do pobrania" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "Wystąpił/o {0} koflikt/ów podczas importu." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Konflikty podczas pobierania." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -846,6 +864,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 "Powiel" @@ -869,85 +887,91 @@ msgstr "Kończy pracę z programem." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Wszystkie obrazy" + +#: ../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 "Eksportuj do 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 "Eksportuj dane do pliku 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 "Nie ma nic do wyeksportowania. Utwórz jakieś obiekty." -#: ../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 "parametr {0} nie może być wartością null" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Eksportuj do pliku GPX" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Pomoc JOSM w sieci" -#: ../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 "Otwórz w przeglądarce" -#: ../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 "Edycja" -#: ../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 "Odśwież" -#: ../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 "Strony pomocy można edytować tylko z Pomocy Online JOSM" -#: ../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 "Błąd w czasie ładowania strony {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." msgstr "Brak strony pomocy. Utwórz ją w języku angielskim." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1001,22 +1025,26 @@ msgstr "Włącz aktualną warstwę do innej." +#: ../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 "Połącz węzły" -#: ../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 "Scala wybrane węzły z najstarszym." -#: ../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 "Proszę wybierz przynajmniej dwa węzły aby scalić." -#: ../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 "Czy scalić węzły z różnych relacji?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Scal mimo tego" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1024,9 +1052,5 @@ msgstr "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Scal mimo tego" - -#: ../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 "" @@ -1034,69 +1058,69 @@ "używana." -#: ../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 "Scal {0} węzłów" +#: ../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 "Połącz wybrane elementy." -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Odbicie lustrzane" -#: ../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 "Odwraca zaznoczone węzły i drogi." -#: ../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 "Wybierz co najmniej jeden węzeł lub drogę." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "do góry" -#: ../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 "Przesuń obiekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "na dół" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "w lewo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "w prawo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Przesuń {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 "Przesuwa obiekty {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 "Nie można przenieść zaznaczonych obiektów poza świat." @@ -1104,5 +1128,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 "Nowa" @@ -1112,17 +1136,22 @@ msgstr "Tworzy nową mapę" -#: ../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 "Otwórz..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Otwiera plik." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Nie mogę czytać pliku ''{0}''. Komunikat błędu:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Otwiera plik." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Nieznana rola \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1160,13 +1189,13 @@ msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Dozwolone są tylko dwa węzły" -#: ../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 "Zaznaczenie musi składać się wyłącznie z dróg." -#: ../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 "" @@ -1174,10 +1203,5 @@ "czterech węzłach." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość." - -#: ../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 " @@ -1186,9 +1210,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 "Wybrano tylko jeden węzeł" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Korekta prostopadłości" @@ -1204,13 +1228,28 @@ msgstr "Wkleja zawartość schowka." -#: ../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 "Wklej znaczniki" -#: ../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] "Wczytywanie {0}" +msgstr[1] "Wczytywanie {0}" +msgstr[2] "Wczytywanie {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1236,37 +1275,32 @@ msgstr "Powtarza ostatnio wycofaną czynność." -#: ../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 "Zmień nazwę warstwy" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "zmień także nazwę pliku" -#: ../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 "Nie mogłem przemianować pliku ''{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 "Odwróć kierunek dróg" -#: ../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 "Zmienia kierunek wszystkich zaznaczonych dróg na przeciwny." -#: ../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 "Proszę zaznaczyć co najmniej jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Odwróć kierunek dróg" @@ -1274,10 +1308,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 "Zapisz" #: ../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 "Zapisuje bieżące dane." @@ -1288,37 +1323,25 @@ msgstr "Plik {0} już istnieje. Nadpisać?" -#: ../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 "" -"Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check " -"conditions for no layer\"." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Pusty dokument" -#: ../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 "Dokument nie zawiera żadnych danych." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Zapisz pomimo tego" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikty" -#: ../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 " @@ -1328,28 +1351,28 @@ "odrzucone. Czy kontunuować?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Odrzuć konflikty i zapisz" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Zapisz plik OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Zapisz plik GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Zapisz warstwę" +#: ../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 "Zapisz jako..." -#: ../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 "Zapisuje bieżące dane do nowego pliku." @@ -1382,33 +1405,33 @@ msgstr "Pomoc: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Raport konfiguracji" -#: ../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 "Skopiuj do schowka i zamknij" -#: ../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 "Zamknij" +#: ../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 "Rozdziel drogę" -#: ../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 "Rozdziela drogę w zaznaczonym węźle." -#: ../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 "Bieżące zaznaczenie nie może być użyte do rozdzielenia." -#: ../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." @@ -1417,5 +1440,5 @@ msgstr[2] "Wybrane węzły nie są w środku żadnej drogi." -#: ../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 " @@ -1428,9 +1451,9 @@ msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę." -#: ../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 "Wybrane węzły nie współdzielą tej samej trasy." -#: ../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." @@ -1439,10 +1462,10 @@ msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów." -#: ../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 "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną." -#: ../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 " @@ -1452,5 +1475,5 @@ "węzły w środku drogi.)" -#: ../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 " @@ -1458,5 +1481,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 " @@ -1464,8 +1487,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 "Rozdziel drogę {0} na {1} części" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Zamykanie zestawu zmian..." + +#: ../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 "Zamykanie zestawu zmian..." + +#: ../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 "Otwieranie zestawu zmian..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Zamykanie zestawu zmian..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1483,42 +1531,42 @@ msgstr "Przełącza ustawienie globalne \"{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 "Rozdziel drogi" -#: ../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 "Powiela węzły które używane są przez różne drogi." -#: ../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 "Ten węzeł nie jest przyklejony do niczego więcej." -#: ../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 "Żaden z tych węzłów nie jest przyklejony do niczego więcej." -#: ../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 "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej." -#: ../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 "Bieżące zaznaczenie nie może być użyte do rozdzielenia." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Wybierz przynajmniej:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Jeden węzęł z tagami lub" -#: ../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 "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "" @@ -1526,5 +1574,5 @@ "tych dróg lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1533,5 +1581,5 @@ "drogę, lub" -#: ../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." @@ -1540,5 +1588,5 @@ "niż jedną drogę." -#: ../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" @@ -1548,9 +1596,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Rozdzielenie węzła" -#: ../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" @@ -1558,5 +1606,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" @@ -1600,61 +1648,71 @@ msgstr "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)" -#: ../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 "Odświeżanie danych" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Aktualizuj zaznaczenie" -#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Wybrano zbiór pusty." -#: ../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 "Wyślij do 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 "Wysyła wszystkie zmiany na serwer 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 "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Brak zmian do wysłania." -#: ../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 "" -#: ../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 "Synchronizuj cały zestaw danych" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1668,17 +1726,17 @@ msgstr "" -#: ../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 "Wykryto konflikt" #. 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 "niespodziewana wartość powrotna. Dostałem {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1689,32 +1747,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "Załadunek się nie powiódł.
{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 "Załadunek do API OSM się nie udał." -#: ../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 "Czy wysłać te zmiany?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Wyślij zmiany" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Dodaj nowy węzeł do istniejącej drogi" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "Załadunek wszystkich zmian w jednym żądaniu." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1722,31 +1818,82 @@ 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 "Dołącz krótki opis zmian, które wysyłasz do serwera:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Ustawienia mapy" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Obiekty do dodania:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Obiekty do zmiany:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Obiekty do usunięcia:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Czy wysłać te zmiany?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Wyślij zmiany" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Wysyłanie" +#: ../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] "Obiekty do dodania:" +msgstr[1] "Obiekty do dodania:" +msgstr[2] "Obiekty do dodania:" + +#: ../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] "Obiekty do zmiany:" +msgstr[1] "Obiekty do zmiany:" +msgstr[2] "Obiekty do zmiany:" + +#: ../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] "Obiekty do usunięcia:" +msgstr[1] "Obiekty do usunięcia:" +msgstr[2] "Obiekty do usunięcia:" + +#: ../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 "Ostatnia zmiana o {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1770,20 +1917,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 "Audio: {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 "Szybciej" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Zwiększa prędkość odtwarzania." @@ -1825,10 +1972,10 @@ msgstr "Odtwórz poprzedni znacznik." -#: ../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 "Wolniej" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Zmniejsza prędkość odtwarzania." @@ -1856,31 +2003,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 "Nie zaimportowano danych." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "dane OpenSteetMap" -#: ../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 "Pobieranie {0} z {1} (pozostało: {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Odświeżanie danych" - -#: ../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 "The following errors occurred during mass download:{0}" -#: ../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 "Błędy podczas pobierania" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1892,20 +2035,20 @@ msgstr "" -#: ../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 "Tryb kasowania" -#: ../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 "Usuwanie węzłów lub dróg." -#: ../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 @@ -1914,5 +2057,5 @@ msgstr "Tryb: {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 " @@ -1922,55 +2065,69 @@ "usuwaniu drogi. Ctrl: usuwa powiązane obiekty." -#: ../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 "parameter ''{0}'' nie może być pusty (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 "Rysowanie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Tworzenie węzłów i dróg." -#: ../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 @@ -1978,38 +2135,38 @@ msgstr "zaznaczony" -#: ../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 "Nie można dodać węzła poza granicami świata." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Dodaj węzeł" -#: ../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 "Dodaj węzeł do drogi" -#: ../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 "Połącz istniejący drogę z węzłem" -#: ../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 "Dodaj nowy węzeł do istniejącej drogi" -#: ../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 "Dodaj węzeł do drogi i połącz" -#: ../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 "Utwórz nowy węzeł." -#: ../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 "Zaznacz węzeł pod kursorem." -#: ../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." @@ -2018,14 +2175,14 @@ msgstr[1] "" -#: ../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 "Zacznij nową drogę od ostatniego węzła" -#: ../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 "Kontynuuj drogę od ostatniego węzła." -#: ../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 "Zakończ rysowanie." @@ -2045,5 +2202,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 "" @@ -2054,5 +2211,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 "Zwolnij przycisk myszy aby zakończyć obracanie." @@ -2068,17 +2225,18 @@ msgstr "" +#: ../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 "Zaznacz" -#: ../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 "Wybieranie, przesuwanie i obracanie obiektów" -#: ../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" @@ -2087,13 +2245,21 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Więcej elementów" -#: ../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 "Przesuń je" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Cofnij przesunięcie" + +#: ../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 "" @@ -2103,13 +2269,9 @@ "na pewno tego chcesz?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Przesuń je" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Cofnij przesunięcie" - -#: ../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." @@ -2118,5 +2280,5 @@ "najbliższym węzłem." -#: ../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-" @@ -2141,61 +2303,61 @@ "+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" +#: ../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 "Szukaj..." -#: ../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 "Szukaj obiektów" -#: ../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 "Nie mogę szukać ponieważ nie załadowano danych." -#: ../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 "Podaj proszę czego szukać." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "zamień zaznaczenie" -#: ../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 "dodaj do zaznaczenia" -#: ../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 "usuń z zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "uwzględnij wielkość liter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "wyrażenie regularne" +#: ../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' oraz 'Street' w dowolnym kluczu lub nazwie." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." -#: ../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' gdziekolwiek w nazwie" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2203,110 +2365,111 @@ msgstr "" -#: ../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 - brak 'Bak' w nazwie" -#: ../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: - klucz=foot ustawiony na dowolną wartość" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +msgid "Special targets:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" -msgstr "" +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - rodzaj obiektu (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - rodzaj obiektu (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - obiekt z podanym ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - obiekt z podanym ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - obiekt z podaną liczbą węzłów" -#: ../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 - wszystkie zmienione obiekty" -#: ../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 - wszystkie zaznaczone obiekty" -#: ../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 - wszystkie niekompletne obiekty" -#: ../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 "untagged - wszystkie obiekty bez tagów" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Użyj I lub OR by połączyć logicznym \"lub\"" -#: ../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 "Użyj \" aby wpisać operator (np.: jeżeli klucz zawiera :)" -#: ../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 "Użyj ( oraz ) aby pogrupować wyrażenia" -#: ../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 "Szukaj" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Rozpocznij szukanie" -#: ../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 "Nie znaleziono nic szukając ''{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 "Niczego nie dodano do zaznaczenia szukając \"{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 "Niczego nie usunięto z zaznaczenia szukając \"{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 "Znaleziono {0} pasujących." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2367,58 +2530,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Załaduj zaznaczenie" -#: ../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 "Kontakt {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Pobieranie..." -#: ../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 "Nie można odczytać \"{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 "Błąd przetwarzania adresu URL: \"{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 "Błąd podczas łączenia z serwerem." -#: ../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 "Dodaj węzeł" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Dodaj {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 "Relacje: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Zmień {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 "Zmień {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Zmień relację" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Usuń \"{0}\" dla {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Usuń \"{0}\" dla {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 "Usuń \"{0}\" dla {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Ustaw {0}={1} dla {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 "Ustaw {0}={1} dla {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Ustaw {0}={1} dla {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" @@ -2428,10 +2629,10 @@ msgstr[2] "obiektów" -#: ../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 "Usuń \"{0}\" dla {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}" @@ -2443,5 +2644,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2450,10 +2651,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2462,5 +2663,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}''" @@ -2484,40 +2685,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Usuń {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Usuń {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] "Usuń {0} {1}" +msgstr[1] "Usuń {0} {1}" +msgstr[2] "Usuń {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] "Tryb kasowania" +msgstr[1] "Tryb kasowania" +msgstr[2] "Tryb kasowania" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Usuń {0} {1}" +msgstr[1] "Usuń {0} {1}" +msgstr[2] "Usuń {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] "Usuń z relacji" +msgstr[1] "Usuń z relacji" +msgstr[2] "Usuń z relacji" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Sprzeczne relacje" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" - -#: ../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 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Usuń z relacji" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Rozdziel segmenty drogi" @@ -2525,6 +2746,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." @@ -2536,5 +2757,5 @@ "węzłów.
Czy naprawdę zamierzasz je usunąć?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Potwierdź usunięcie." @@ -2545,5 +2766,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2578,10 +2799,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2594,18 +2825,38 @@ msgstr "Sekwencja" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Rozwiąż {0} konfliktów w {1} obiektach" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Rozwiąż {0} konfliktów w {1} obiektach" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Rozwiąż {0} konfliktów w {1} obiektach" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Rozwiąż {0} konfliktów w {1} obiektach" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Rozwiąż {0} konfliktów w {1} obiektach" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Rozwiąż {0} konfliktów w {1} obiektach" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2631,13 +2882,13 @@ "węzłów powinny zostać uwzględniony aby zachować spójność." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relacja" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Poprzednia rola" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nowa rola" @@ -2656,62 +2907,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 "Nowa wartość" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Zastosuj wybrane zmiany" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Porzuć zmiany" -#: ../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 "Wybierz, które właściwości chcesz zmienić." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Właściwości " -#: ../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 "Automatyczna korekcja tagów" -#: ../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 "Błąd w pliku konfiguracyjnym w linii {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../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 +#, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" + +#: ../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 "Preferencje zostały zapisane na {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 "Wysłanie preferencji nie powiodło się. Powód: {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 "Pobranie preferencji z serwera nie powiodło się." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2725,29 +3033,36 @@ msgstr "" -#: ../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 "Stopnie dziesiętne" -#: ../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 "Stopnie minuty sekundy" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "W" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../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}" @@ -2759,15 +3074,229 @@ msgstr "" -#: ../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 "niekompletne" - -#: ../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 "Błąd: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Uwaga: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "Nieznana rola \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "nieotagowany" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "tekst" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "nieaktywne" + #: ../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" @@ -2777,22 +3306,7 @@ msgstr[2] "węzłów" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Błąd: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Uwaga: {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" @@ -2802,12 +3316,7 @@ msgstr[2] "dróg" -#: ../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" @@ -2817,27 +3326,129 @@ msgstr[2] "relacji" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../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 "nieotagowana droga" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +msgid "incomplete way" +msgstr "niekompletna droga" + +#: ../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 "tło" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 +msgid "highlight" +msgstr "wyróżnienie" + +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 +msgid "WGS84 Geographic" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +msgid "Lambert Zone (France)" +msgstr "odwzorowanie Lamberta (Francja)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 +msgid "Lambert Zone (Estonia)" +msgstr "odwzorowanie Lamberta (Estonia)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 +msgid "Mercator" +msgstr "odwzorowanie Merkatora" + +#: ../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 "" + +#: ../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 "Nie mogę czytać pliku ''{0}''. Komunikat błędu:
{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 "Nie pokazuj ponownie" + +#: ../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 "niekompletne" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "droga" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "tory kolejowe" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "szlak wodny" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "zagospodarowanie przestrzenne" + +#: ../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} węzeł" +msgstr[1] "{0} węzły" +msgstr[2] "{0} węzłów" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 #, java-format msgid "{0} member" @@ -2847,308 +3458,50 @@ msgstr[2] "{0} elementów" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "droga" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "tory kolejowe" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "szlak wodny" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "zagospodarowanie przestrzenne" - -#: ../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} węzeł" -msgstr[1] "{0} węzły" -msgstr[2] "{0} węzłów" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "Nieznana rola \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "nieotagowany" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "tekst" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "nieaktywne" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -msgid "untagged way" -msgstr "nieotagowana droga" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 -msgid "incomplete way" -msgstr "niekompletna droga" - -#: ../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 "tło" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -msgid "highlight" -msgstr "wyróżnienie" - -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographic" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 -msgid "Lambert Zone (France)" -msgstr "odwzorowanie Lamberta (Francja)" - -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 -msgid "Lambert Zone (Estonia)" -msgstr "odwzorowanie Lamberta (Estonia)" - -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 -msgid "Mercator" -msgstr "odwzorowanie Merkatora" - -#: ../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 "" - -#: ../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 "Nie pokazuj ponownie" - -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "nieznany" + +#: ../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 "" @@ -3158,36 +3511,9 @@ msgstr "" -#: ../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 "nieznany" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3197,9 +3523,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 "" @@ -3208,9 +3534,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3219,9 +3545,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 "" @@ -3231,9 +3568,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Nieznany adres" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3243,11 +3580,6 @@ msgstr "" -#: ../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 "" @@ -3265,38 +3597,38 @@ msgstr "Pobieranie wiadomości dnia" -#: ../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 "Wyślij Ustawienia" -#: ../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 "Wyślij bieżące ustawienia na serwer" -#: ../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 "tekst" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nazwa użytkownika." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Hasło 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 "" -#: ../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 "tekst;tekst;..." -#: ../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 " @@ -3304,5 +3636,5 @@ msgstr "" -#: ../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 " @@ -3310,5 +3642,5 @@ msgstr "" -#: ../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 " @@ -3316,75 +3648,94 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "dowolne" -#: ../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 "Nazwa użytkownika" -#: ../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 "Hasło" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "użycie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opcje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Wyświetl tę pomoc" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Przywróć domyślne ustawienia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Ustaw język" -#: ../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 "przykłady" -#: ../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" @@ -3392,47 +3743,47 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Aktywacja zaktualizowanych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Ładowanie wczesnych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Zapisywanie domyślnych ustawień" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Ładowanie wtyczek" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Plik" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Narzędzia" -#: ../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 "Szablony" -#: ../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 @@ -3444,21 +3795,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 "Widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Przełącza widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Pełny ekran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Przełącza widok na pełen ekran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Dźwięk" @@ -3498,58 +3849,44 @@ msgstr "Zmniejsz" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "skala" -#: ../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 "Długość geograficzna punktu wskazywanego przez kursor." -#: ../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 "Nazwa obiektu wskazywanego przez kursor." -#: ../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 "Szerokość geograficzna punktu wskazywanego przez kursor." -#: ../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 "Kąt pomiędzy poprzednim i bieżącym segmentem tworzonej drogi." -#: ../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 "Namiar (kompasowy) tworzonego odcinka." -#: ../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 "Długość nowego, tworzonego odcinka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(brak obiektu)" -#: ../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 "warstwa nie jest na liście." -#: ../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 "" - -#: ../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 "" @@ -3561,10 +3898,4 @@ msgid "File not found" msgstr "Plik nie został odnaleziony" - -#: ../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 @@ -3623,7 +3954,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" @@ -3639,5 +3969,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" @@ -3740,5 +4070,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 "" @@ -3749,5 +4079,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" @@ -3761,5 +4091,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 "" @@ -3834,6 +4164,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" @@ -3943,10 +4273,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 "" @@ -3955,19 +4285,19 @@ msgstr "" -#: ../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 "" @@ -3976,5 +4306,5 @@ msgstr "" -#: ../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 "" @@ -3992,9 +4322,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 " @@ -4002,110 +4332,112 @@ 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 "usunięto" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4114,21 +4446,21 @@ msgstr "" -#: ../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 "Rola" #: ../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 "" @@ -4167,10 +4499,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 @@ -4179,10 +4512,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 @@ -4196,5 +4530,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}" @@ -4235,4 +4569,143 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "wszystkie" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Wybierz kolor" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parameter ''{0}'' nie może być pusty (null)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Jeszcze nie zaimplementowane." + +#: ../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 "z drogi" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Usuń z relacji" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikty podczas pobierania." + +#: ../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} droga" +msgstr[1] "{0} drogi" +msgstr[2] "{0} dróg" + +#: ../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} relacja" +msgstr[1] "{0} relacje" +msgstr[2] "{0} relacji" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Zmiana rozdzielczości" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Rozwiąż konflikty" + +#: ../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 "Wklej" + +#: ../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} droga" +msgstr[1] "{0} drogi" +msgstr[2] "{0} dróg" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4248,10 +4721,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 @@ -4259,5 +4732,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}" @@ -4288,36 +4761,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 "Zaznacz na mapie elementy zaznaczone na powyższej liście." -#: ../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 "" @@ -4329,150 +4796,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 "Historia" -#: ../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 "Wyświetla historię wszystkich zaznaczonych elementów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Warstwa: {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 "Relacje: {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 "" - -#: ../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 "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę." #. 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 "Warstwy" -#: ../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 "Otwiera listę wszystkich wczytanych warstw." -#: ../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 "Usuń zaznaczoną warstwę." -#: ../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 "Usuń warstwę" - -#: ../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 "" - -#: ../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 "Pokaż/Ukryj" -#: ../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 "Zmienia widocznoś zaznaczonej warstwy." -#: ../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 "Przesuwa wybraną warstwę o jeden wiersz do góry." -#: ../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 "Przesuwa wybraną warstwę o jedno odczo do dołu." -#: ../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." @@ -4482,28 +4917,22 @@ msgstr[2] "Ta operacja może zmienić {0} obiektów." -#: ../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 "Ustawienie wartości na pustą usuwa klucz" -#: ../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 "Zmienić wartości?" -#: ../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" @@ -4513,89 +4942,84 @@ msgstr[2] "Zmiana właściwości {0} obiektów." -#: ../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 "Proszę wybierz klucz" -#: ../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 "Proszę wybierz wartość" -#: ../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 "Zaznacz proszę te obiekty, których właściwości chcesz zmienić." -#: ../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 "Właściwości/członkostwo" -#: ../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 "Właściwości zaznaczonych obiektów." #. 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 "Członek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Dodaj właściwości" -#: ../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 "Dodaj" -#: ../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 "Dodaj nową parę nazwa/wartość do wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Edycja właściwości" -#: ../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 "Edytuj wartość wybranego klucza dla wszystkich obiektów" -#: ../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 "Właściwości: {0} / członkostwo: {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 "Właściwości / członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Zmień relację" -#: ../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 "Na pewno usunąć zaznaczenie z relacji {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 "Usuń wybrany klucz ze wszystkich obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Usuń właściwość" @@ -4604,34 +5028,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 "Relacje" -#: ../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 "Otwiera listę wszystkich relacji" -#: ../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 "Relacje: {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 "Otwiera okno edycji dla zaznaczonej relacji." -#: ../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 "Usuwa zaznaczoną relację." -#: ../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 "Utwórz nową relację" -#: ../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 "" @@ -4664,25 +5088,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 "Zaznaczenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} droga" -msgstr[1] "{0} drogi" -msgstr[2] "{0} dróg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relacja" -msgstr[1] "{0} relacje" -msgstr[2] "{0} relacji" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4690,14 +5098,9 @@ msgstr "Zaznaczenie: {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 "Oderwij panel" -#: ../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." @@ -4705,64 +5108,97 @@ "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." -#: ../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 "Kliknij aby zminimalizować/maksymalizować zawartość panela" -#: ../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 "Autorzy" -#: ../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 "Otwiera listę ludzi pracujących nad zaznaczonymi obiektami." -#: ../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] "Autor" +msgstr[1] "Autor" +msgstr[2] "Autor" + +#: ../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 +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 "Więcej informacji na temat tej funkcji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "Liczba obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autorzy: {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 "" @@ -4771,47 +5207,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 " @@ -4820,14 +5250,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 "" @@ -4837,9 +5267,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 "" @@ -4849,15 +5279,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4865,5 +5295,5 @@ msgstr "" -#: ../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 " @@ -4871,20 +5301,20 @@ msgstr "" -#: ../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 "" @@ -4893,57 +5323,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 "Przesuń aktualnie zaznaczonych członkół w górę" #. 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 "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." #. 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 " @@ -4952,9 +5382,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 "" @@ -4963,20 +5393,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 @@ -4986,37 +5412,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 "Pobierz wszystkie niekompletne drogi i węzły w relacji" -#: ../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 "Pobierz członków" -#: ../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 "" @@ -5026,30 +5452,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 "" @@ -5063,22 +5489,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 "Ładowanie wczesnych wtyczek" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5111,34 +5542,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Zakładki" -#: ../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 "Proszę wcześniej podać wybrane współrzędne." -#: ../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 "Proszę podać nazwę lokalizacji." -#: ../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 "Wybierz najpierw zakładkę." @@ -5195,13 +5613,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 "Wpisz proszę czego szukać" -#: ../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 "Nie można odczytać wyników wyszukiwania z serwera." @@ -5209,18 +5627,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 "Wpisz nazwę miejsce do odnalezienia:" -#. 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 "Miejsca" #. 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 "nazwa" @@ -5259,37 +5676,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 "rodzaj" -#: ../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 "niedaleko" -#: ../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 "powiększenie" -#: ../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: " @@ -5298,5 +5715,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 "Mapa \"Slippy\"" @@ -5323,46 +5740,74 @@ msgstr "Numery kafelków mapy" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Wyślij bieżące ustawienia na serwer" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5681,14 +6126,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5864,8 +6323,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" #. @@ -5962,4 +6427,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6073,6 +6541,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 @@ -6080,153 +6548,171 @@ #: 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 "Nazwa" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Zmień relację" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Więcej informacji na temat tej funkcji" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Ostatnia zmiana o {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6235,32 +6721,288 @@ msgstr "" -#: ../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 "Nazwa ulicy" + +#: ../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 "Proszę wybierz wartość" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parameter ''{0}'' nie może być pusty (null)" + +#: ../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 +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 "Porzuć i wyjdź" + +#: ../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 "Zapisz i wyjdź" + +#: ../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 "Warstwa" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Podczas wysyłania" + +#: ../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 "Plik" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Wysyłanie" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Obrazy dla {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 "Wczytaj 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 "Brak znacznika czasowego dla punktu {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 "Nie można odczytać czasu \"{0}\" w punkcie {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 "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" -#: ../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 @@ -6268,29 +7010,29 @@ msgstr "Wczytywanie {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 "Geolokalizowane obrazy" -#: ../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 początek: {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 koniec: {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 "aktualne przesunięcie: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "różnica stref czasowych: " -#: ../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" @@ -6300,14 +7042,14 @@ msgstr[2] "obrazów" -#: ../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} wewnątrz ścieżki GPS." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synchronizuj zegar" -#: ../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 @@ -6315,82 +7057,82 @@ msgstr "Pliki 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 "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." -#: ../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 "Plik {0} nie zawiera żadnych danych EXIF o czasie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Obraz" -#: ../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 "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" -#: ../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 "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" -#: ../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 "Synchronizuj czas z urządzeniem 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 "Podany czas nie został rozpoznany." -#: ../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 "punkt 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 "Dostosuj rysowanie linii" +#: ../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 "Użyj ustawień globalnych." + #: ../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 "Użyj ustawień globalnych." +msgid "Draw lines between points for this layer." +msgstr "Rysuj linie pomiędzy punktami na tej warstwie." #: ../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 "Rysuj linie pomiędzy punktami na tej warstwie." - -#: ../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 "Nie rysuj linii pomiędzy punktami na tej warstwie." -#: ../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 "Wybierz opcje rysowania linii" -#: ../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 "Dostosuj kolor" -#: ../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 "Domyślny" -#: ../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" @@ -6453,5 +7195,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}" @@ -6467,10 +7209,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 "Przekształć w warstwę danych" #: ../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." @@ -6481,11 +7223,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 @@ -6527,4 +7269,9 @@ "html>" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Pobieranie danych" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6545,64 +7292,64 @@ msgstr "" -#: ../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 "Warstwa danych {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 "poza pobranym obszarem" -#: ../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 "" -#: ../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 "" -#: ../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 "Obiekty na warstwie {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} usuniętych.)" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -6611,5 +7358,5 @@ msgstr[2] "tras" -#: ../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" @@ -6618,5 +7365,5 @@ msgstr[2] "punktów" -#: ../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" @@ -6626,5 +7373,5 @@ msgstr[2] "trasa z {0} punktami" -#: ../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" @@ -6634,5 +7381,5 @@ msgstr[2] "{0} składa się z {1} ścieżek" -#: ../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" @@ -6642,9 +7389,9 @@ msgstr[2] "{0} punktów" -#: ../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 "znacznik 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" @@ -6653,5 +7400,5 @@ msgstr[2] "znaczników" -#: ../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" @@ -6671,5 +7418,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}." @@ -6677,5 +7424,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 "Nie można zsynchronizować aktualnie odtwarzanej warstwy." @@ -6703,5 +7450,5 @@ msgstr "Zmienia widoczność markerów tekstowych i ikon." -#: ../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 " @@ -6709,5 +7456,5 @@ msgstr "" -#: ../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 " @@ -6715,29 +7462,29 @@ msgstr "" -#: ../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 "Nie można utworzyć nowego znacznika dźwiękowego." +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "There was an error while trying to display the URL for this marker" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(Adres URL był: " -#: ../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 "Błąd podczas wyświetlania adresu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Ustawienia zaawansowane" -#: ../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 "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!" -#: ../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 @@ -6745,14 +7492,14 @@ 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 "Ustawiona wartość jest wartością domyślną." -#: ../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 "Domyślną wartością jest \"{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 "" @@ -6760,13 +7507,13 @@ "użyte)." -#: ../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 "Proszę wybrać wiersz do edycji" -#: ../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 @@ -6774,14 +7521,14 @@ msgstr "Nowa wartość dla {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 "Proszę wybrać wiersz do usunięcia" -#: ../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 "Podaj nowy klucz i jego wartość" @@ -6904,40 +7651,40 @@ msgstr "Kalibracja urządzenia nagrywającego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Kolor" -#: ../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 "Styl rysowania {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 "Warstwa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Wybierz" -#: ../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 "Wybierz kolor dla {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 "Ustaw na domyślne" -#: ../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 "Domyślne ustawienie dla wszystkich" -#: ../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 "Kolory wykorzystywane przez różne obiekty w JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Kolory" @@ -6981,5 +7728,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Samochód" @@ -7001,16 +7748,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 "Rowery" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7040,12 +7788,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 "Ruch pieszy" @@ -7224,5 +7972,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 "Wyświetlaj ekran powitalny" @@ -7230,23 +7978,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 "Wyświetlaj ID obiektu na listach wyboru" #: ../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 "Wyświetlaj ID obiektu na listach wyboru" + +#: ../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 "" -#: ../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 "Wyświetlaj ID obiektu na listach wyboru" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Wygląd i zachowanie" @@ -7278,54 +8037,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 "Konfiguracja dostępnych wtyczek." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Pobierz listę" -#: ../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 "Aktualizuj" -#: ../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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Ustawienia wyświetlania" -#: ../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 " @@ -7333,42 +8092,42 @@ msgstr "Różnorodne ustawienia, które wpływają na wygląd programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Ustawienia połączenia" -#: ../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 "Ustawienia połączenia z serwerem 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 "Ustawienia mapy" -#: ../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 "Ustawienia odwzorowania kartograficznego oraz interpretacji danych." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Ustawienia audio" -#: ../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 "Ustawienia odtwarzacza audio oraz znaczników audio." -#: ../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 "" "Musisz ponownie uruchomić JOSM aby niektóre ustawienia stały się aktywne." -#: ../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 "Wyświetlaj współrzędne jako" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Rodzaj odwzorowania kartograficznego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Odwzorowanie kartograficzne" @@ -7401,12 +8160,4 @@ msgid "Proxy server password" msgstr "Proxy - hasło" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Adres URL serwera OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Adres URL serwera" #. 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 @@ -7433,61 +8184,60 @@ msgstr "Skrót" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7653,36 +8403,59 @@ 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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Dodaj komentarz" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Usuń zaznaczoną warstwę." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Więcej informacji na temat tej funkcji" #. 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 "Dodatkowe atrybuty:" -#: ../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 "Używa szablon \"{0}\" z grupy \"{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 "Używa szablon \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "zamknięta droga" -#: ../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 "Nieznany typ: {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 @@ -7690,15 +8463,15 @@ msgstr "Nie można odczytać źródła szablonów: {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 "Błąd podczas przetwarzania {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 "Elementy typu {0} nie są wspierane." -#: ../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 @@ -7709,22 +8482,22 @@ msgstr[2] "Zmień {0} obiektów" -#: ../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 "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Zmień właściwości" -#: ../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}''" @@ -7764,11 +8537,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 "Nie można odczytać \"{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 " @@ -7778,38 +8551,38 @@ "tras na licencji 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 "Pliki GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "Opis trasy GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Dodaj informacje o autorze" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Imię i nazwisko" -#: ../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 "Prawa autorskie (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Predefiniowane" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Prawa autorskie - rok" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Słowa kluczowe" @@ -7819,9 +8592,9 @@ msgstr "Opcje eksportu" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Eksportuj i zapisz" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7832,10 +8605,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 "Wybierz jedną z gotowych licencji" -#: ../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 @@ -7845,12 +8618,12 @@ msgstr "Znaczniki z {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 "" -#: ../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" @@ -7871,6 +8644,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 @@ -7880,20 +8653,40 @@ msgstr "Pobieranie danych 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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Niczego nie dodano do zaznaczenia szukając \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7901,34 +8694,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Pliki 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 "Liczba wczytanych współrzędnych: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Nieprawidłowe sekwencje: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Błędy sum kontrolnych: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Nieznane sewkencje: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Zerowe współrzędne: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Import NMEA zakończony powodzeniem" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Import NMEA zakończony niepowodzeniem!" @@ -7939,9 +8732,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7950,15 +8743,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7966,33 +8759,91 @@ msgstr "" -#: ../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 "Otwieranie zestawu zmian..." -#: ../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 "Otwieranie zestawu zmian..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Otwieranie zestawu zmian..." + +#: ../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 "Otwieranie zestawu zmian..." + +#: ../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 "Zamykanie zestawu zmian..." -#: ../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 "Zamykanie zestawu zmian..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Otwieranie zestawu zmian..." + +#: ../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 "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Wysyłanie..." -#: ../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}." @@ -8020,42 +8871,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Nieprawidłowe hasło lub nazwa użytkownika." -#: ../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 "Uwaga: Hasło nie jest szyfrowane podczas transmisji." -#: ../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 "Zapisz nazwę użytkownika i hasło (nieszyfrowane)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Wprowadź hasło" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Logowanie" -#: ../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 "Adres URL serwera OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Adres URL serwera" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "Hasło 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." @@ -8064,20 +8923,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Pliki serwera OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8086,5 +8945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8279,35 +9138,46 @@ "Internetem." -#: ../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} pozostało. Przesyłanie {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} pozostało. Przesyłanie {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} pozostało. Przesyłanie {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 "Nie ma nic do wysłania. Wprowadź jakieś dane." + +#: ../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 "Aktualizuj wtyczki" -#: ../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 "Pobierz wtyczki" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8319,5 +9189,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." @@ -8326,23 +9196,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8353,30 +9223,30 @@ msgstr "Wystąpił błąd we wtyczce {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 "" -#: ../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 "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {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 "Nie znaleziono wtyczki: {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 "Ostatnia aktualizacja wtyczek odbyła się przed {0} dniami." -#: ../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 " @@ -8386,21 +9256,21 @@ "ustawienie opcji konfiguracyjnej '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 "Zablokuj wtyczkę" -#: ../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 "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?" -#: ../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 " @@ -8410,5 +9280,5 @@ "uprawnienia aby nadpisać istniejące pliki." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8418,10 +9288,10 @@ "\"." -#: ../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 "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {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." @@ -8430,9 +9300,9 @@ "błędu." -#: ../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 "Czy ta wtyczka ma zostać zablokowana?" -#: ../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 " @@ -8442,13 +9312,13 @@ "wyładować wtyczkę." -#: ../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" @@ -8459,5 +9329,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" @@ -8467,18 +9337,18 @@ msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Nie znaleziono informacji o wtyczce." -#: ../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 "" -#: ../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 "Wszystkie zainstalowane wtyczki są aktualne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8491,9 +9361,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 "Pobierz brakujące wtyczki" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8506,35 +9376,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}: Wersja {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 "Wtyczka dostarczana wraz z 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 "Błąd podczas wczytywania pliku informacyjnego wtyczki: {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 "To znajduje się za końcem nagrania." -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Błąd odtwarzania dźwięku" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Nic nie rób" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Zgłoś błąd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8548,14 +9418,14 @@ "z najnowszej wersji JOSM, rozważ proszę możliwość zgłoszenia błędu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Nieoczekiwany błąd" -#: ../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 "Proszę zgłosić bład pod adresem {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 "" @@ -8563,5 +9433,5 @@ "błędną sytuację." -#: ../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 " @@ -8571,13 +9441,13 @@ "błędu." -#: ../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 "Upewnij się, żeby załączyć następujące informacje:" -#: ../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 "(Tekst już został skopiowany do schowka.)" -#: ../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}." @@ -8585,6 +9455,6 @@ "Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {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 "" @@ -8593,5 +9463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8600,5 +9470,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8611,5 +9481,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" @@ -8619,5 +9489,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8628,17 +9498,17 @@ "\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 "(Podpowiedź: Możesz zmienić skróty klawiszowe w ustawieniach.)" -#: ../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 "" @@ -8647,4 +9517,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8669,9 +9574,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 @@ -8679,27 +9602,40 @@ msgstr "Wyślij ślady" -#: ../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" +#: ../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 "Opis" -#: ../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}" @@ -8707,47 +9643,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 "Łączenie..." -#: ../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 "Błąd podczas wysyłania" -#: ../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 "Wysyłanie GPX zakończone sukcesem" -#: ../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 "" -#: ../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 "Nie podano opisu. Proszę podać jakiś opis." -#: ../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 "Nie wybrano żadnej warstwy GPX. Nie można wysłać sladu." -#: ../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 "Nie podano nazwy użytkownika." -#: ../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 "Nie podano hasła." -#: ../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 "Wysyłanie śladu GPX" @@ -8860,19 +9796,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 "Pliki 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 "" -#: ../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 "Błąd podczas przetwarzania {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." @@ -8881,34 +9817,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "Brak daty" -#: ../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 "Otwórz inne zdjęcie" -#: ../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 "" -#: ../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" @@ -8918,69 +9854,69 @@ "Proszę użyć wybranego formatu." -#: ../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 "Nieprawidłowa data" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 "Scieżka 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 "" -#: ../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 "Strefa czasowa: " -#: ../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 "" -#: ../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 "Aktualizuj pozycję dla: " -#: ../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 "Wszystkie obrazy" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8989,9 +9925,9 @@ msgstr "" -#: ../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 "Nieprawidłowa strefa czasowa" -#: ../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 "" @@ -9000,65 +9936,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Ślad GPX wczytany" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -9066,13 +10002,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9093,5 +10029,5 @@ msgstr "Błąd w pliku {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9104,12 +10040,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 "Zaznacz wszystko" - -#: ../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 "Błąd podczas ładowania pliku" @@ -9138,8 +10073,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 "" "Nie znaleziono miejscowości {0} lub nie jest ona dostępna w WMS.\n" @@ -9150,21 +10085,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 "Kataster" -#: ../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" @@ -9173,37 +10108,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 "" -#: ../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." @@ -9215,18 +10161,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS katastru francuskiego" -#: ../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 "" -#: ../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 " @@ -9234,5 +10180,5 @@ msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach 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). " @@ -9240,39 +10186,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9328,7 +10274,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Nawiązywanie połączenia z serwerem OSM..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 @@ -9366,20 +10311,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" @@ -9387,9 +10332,14 @@ 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 +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" @@ -9397,30 +10347,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "wschód" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "północ" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Zerowe współrzędne: " +msgid "Set " +msgstr "Zaznacz" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9482,6 +10441,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)" @@ -9504,6 +10463,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 "Pusta warstwa" @@ -9519,7 +10478,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Kataster: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10039,6 +10998,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 "woda" @@ -10051,8 +11010,4 @@ msgid "land" msgstr "ląd" - -#: ../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 @@ -10335,9 +11290,9 @@ msgstr "" -#: ../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 "Wyświetla problemy z 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 " @@ -10346,5 +11301,5 @@ msgstr "" -#: ../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 "" @@ -10909,5 +11864,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 "Nazwa ulicy" @@ -10926,29 +11881,29 @@ msgstr "Pokaż panel autorów" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Otwórz stronę użytkownika" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Otwiera stronę użytkownika w przeglądarce" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Wybierz dane użytkownika" -#: ../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 "Proszę zaznaczyć jakieś dane" -#: ../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 "" @@ -10962,23 +11917,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 "" -#: ../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" @@ -10987,38 +11934,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -11026,81 +11973,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Uprość drogę" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Usuwa zbędne węzły z drogi." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Proszę zaznaczyć przynajmniej jedną drogę do uproszczenia." -#: ../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?" @@ -11110,25 +12057,25 @@ msgstr[1] "" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Czy na pewno?" -#: ../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 "Błędy poprawności" -#: ../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 "Sprawdzanie poprawności przebiegło pomyślnie" -#: ../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 "Siatka" -#: ../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 "" @@ -11217,53 +12164,53 @@ msgstr "Przeprowadza sprawdzanie poprawności danych" -#: ../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 "Otwiera okno z informacją o rezultatach sprawdzania poprawności" -#: ../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 "Pokaż problem" -#: ../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 "Napraw" -#: ../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 "Napraw zaznaczone błędy." -#: ../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 "Zignoruj" -#: ../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 "Ignoruj wybrane błędy następnym razem." -#: ../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 "Całą grupę" -#: ../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 "Pojedyncze elementy" -#: ../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 "Nic" -#: ../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" @@ -11287,23 +12234,55 @@ #: ../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 "" "Ten test sprawdza czy dwie drogi, tory lub szlaki wodne przecinają się na " "tej samej warstwie ale nie są połączone węzłem." -#: ../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 "Przecinające się drogi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Przecinające się drogi" -#: ../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 "Aktualizuj pozycję dla: " + +#: ../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 "Powielone węzły drogi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 "Powielone węzły drogi" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11387,23 +12366,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11412,7 +12391,7 @@ msgstr "" +#: ../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 "" @@ -11420,80 +12399,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "DO POPRAWKI" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11501,82 +12480,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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:711 +msgid "Check property values." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "" -#: ../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}''" @@ -11721,7 +12700,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 "budynek" @@ -11735,5 +12714,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 "obszar" @@ -11869,5 +12848,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Wystąpił wyjątek" @@ -11912,14 +12891,14 @@ msgstr "Pomoc wtyczki 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}" @@ -11930,26 +12909,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 "" -#: ../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 "" -#: ../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 " @@ -11957,37 +12936,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -12002,104 +12999,143 @@ 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 "dla wyznaczonych pojazdów" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 "Nieprawidłowa data" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../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 "Zmiana rozdzielczości" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Błędny format pliku" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Ustawienia wtyczki 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 "" -#: ../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 "Nazwa w menu" -#: ../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 "Adres serwera 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 "URL WMS (domyślny)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Wpisz nazwę pozycji w menu oraz adres serwera 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 "Powiększ do wybranych elementów" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Proszę zaznaczyć co najmniej jedną drogę." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12460,62 +13496,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 "Numer" - -#. 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 "Warstwa" #. item "Streets/Motorway" combo "Layer" @@ -12530,5 +13511,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 "Liczba pasów ruchu" @@ -12543,5 +13524,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" @@ -12551,10 +13531,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 "Max. prędkość (km/h)" @@ -12598,9 +13578,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 "jednokierunkowa" @@ -12648,13 +13628,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 "most" @@ -12696,13 +13676,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 "tunel" @@ -12742,12 +13722,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 "wykop" @@ -12787,12 +13767,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 "nasyp" @@ -12948,17 +13928,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 "Szerokość (w metrach)" @@ -12985,4 +13965,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" @@ -13001,11 +13982,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 "Nawierzchnia" @@ -13015,4 +13997,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" @@ -13027,9 +14010,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 "" @@ -13037,10 +14021,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 "chata górska" + +#: 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 "wypożyczalnia" + +#. 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 "Las naturalny" + +#: 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 "bilety parkingowe" #. item "Ways/Track Grade 2" combo "Surface" @@ -13048,12 +14095,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 "bruk" + +#: 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 "żwir" + +#: 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 "bruk" + +#: 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 "niekompletne" + +#: 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 "trawa" + +#: 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 "trawa" + +#: 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 "piach" + +#. 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 "grunt" #. item "Streets/Residential" text "Width (meters)" @@ -13134,20 +14263,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "ograniczenia na drodze" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Edycja ograniczeń na drodze" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "bramka (opłata)" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "ślepa ulica" @@ -13160,8 +14289,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 "Dostęp do drogi" @@ -13196,32 +14325,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 "tak" @@ -13234,40 +14378,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 "droga prywatna" -#: 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 "dla wyznaczonych pojazdów" @@ -13280,19 +14424,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 "dojazd do posesji" @@ -13315,65 +14459,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 "dopuszczalny" -#: 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 "dla rolnictwa" -#: 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 "nie" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Zaopatrzenie" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Samochody dostawcze" @@ -13388,10 +14537,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 "Konie" @@ -13407,17 +14556,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 "Motocykle" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13429,30 +14577,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 "Samochody" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Transport publiczny" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorówka" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Łódka" #. 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 "Min. prędkość (km/h)" @@ -13460,25 +14608,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 "Max. ciężar (w tonach)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Maks. wysokość (w metrach)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Maks. szerokość (w metrach)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Maks. długość (w metrach)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "rondo" @@ -13489,5 +14637,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 "Edycja skrzyżowania" @@ -13503,5 +14651,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" #. @@ -13509,9 +14657,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 "Rodzaj" @@ -13531,10 +14679,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 "autostrada" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "ciąg pieszy" @@ -13556,10 +14704,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 "droga ekspresowa" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "droga ekspresowa - dojazd" @@ -13581,10 +14729,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 "droga krajowa" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "droga krajowa - dojazd" @@ -13606,5 +14754,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" @@ -13619,9 +14767,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "droga powiatowa" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "droga gminna" @@ -13635,9 +14783,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "droga lokalna" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "strefa zamieszkania" @@ -13667,10 +14815,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 "droga serwisowa" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "wydzielony pas autobusowy" @@ -13700,6 +14848,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 "w budowie" @@ -13710,10 +14858,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 "Edycja mostu" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Edycja tunelu" @@ -13721,19 +14869,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Drogi" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "w budowie" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Edycja drogi w budowie" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Skrzyżowanie" @@ -13749,5 +14897,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rondo" @@ -13756,5 +14904,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "ścieżka do jazdy konnej" @@ -13762,5 +14910,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Edycja ścieżki do jazdy konnej" @@ -13768,5 +14916,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "ścieżka rowerowa" @@ -13776,11 +14924,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 "Edycja ścieżki rowerowej" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "ciąg pieszy" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "droga dla pieszych" @@ -13789,11 +14943,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Edycja drogi dla pieszych" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Kolczatka" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "ciąg pieszy" @@ -13802,5 +14962,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Edycja ciągu pieszego" @@ -13808,5 +14968,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "schody" @@ -13816,5 +14976,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 "Edycja schodów" @@ -13823,5 +14983,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "droga gruntowa" @@ -13830,39 +14990,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Edycja drogi gruntowej" -#: 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 "żwir" - -#. 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 "grunt" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "trawa" - -#: 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 "piach" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "droga gruntowa klasy 1" @@ -13871,5 +15003,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Edycja drogi gruntowej klasy 1" @@ -13877,5 +15009,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "droga gruntowa klasy 2" @@ -13884,5 +15016,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Edycja drogi gruntowej klasy 2" @@ -13890,5 +15022,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "droga gruntowa klasy 3" @@ -13897,5 +15029,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Edycja drogi gruntowej klasy 3" @@ -13903,5 +15035,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "droga gruntowa klasy 4" @@ -13910,5 +15042,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Edycja drogi gruntowej klasy 4" @@ -13916,5 +15048,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "droga gruntowa klasy 5" @@ -13923,5 +15055,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Edycja drogi gruntowej klasy 5" @@ -13930,5 +15062,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "ścieżka" @@ -13937,19 +15069,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Edycja ścieżki" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Narty" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Skuter śnieżny" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Narty" - #. 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 "szlak" @@ -13959,5 +15094,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 "Edycja szlaku" @@ -13965,5 +15100,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "szlak górski" @@ -13973,5 +15108,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 "Edycja szlaku górskiego" @@ -13979,5 +15114,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "stromy szlak górski" @@ -13987,5 +15122,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 "miejsce do zawracania" @@ -13993,5 +15128,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "szlak alpejski" @@ -14001,5 +15136,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 "Edycja szlaku alpejskiego" @@ -14007,5 +15142,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "stromy szlak alpejski" @@ -14015,5 +15150,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 "Edycja stromego szlaku alpejskiego" @@ -14021,5 +15156,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "trudny szlak alpejski" @@ -14029,5 +15164,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 "Edycja trudnego szlaku alpejskiego" @@ -14035,10 +15170,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Punkty drogowe" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "skrzyżowanie autostrad" @@ -14046,15 +15181,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Edycja skrzyżowania autostrad" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Numer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "miejsce obsługi podróżnych" @@ -14062,5 +15197,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Edycja miejsca obsługi podróżnych" @@ -14074,4 +15209,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" #. @@ -14091,18 +15228,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 "Operator" @@ -14111,5 +15250,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "sygnalizacja świetlna" @@ -14119,5 +15258,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Typ przejścia dla pieszych" @@ -14126,27 +15265,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 "sygnalizacja świetlna" -#: 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 "wysepka" -#: 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 "nieoznakowane" #. 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 "" @@ -14154,6 +15293,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 "" @@ -14162,11 +15301,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 "" @@ -14174,30 +15313,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 "zebra" -#: 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 "znak stop" @@ -14205,5 +15344,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14212,14 +15351,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Miniaturowe rondo" @@ -14230,14 +15369,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 "Kierunek" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "zgodnie z ruchem wskazówek zegara" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "miejsce do zawracania" @@ -14247,20 +15386,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 "granica miasta" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Edycja tablicy oznaczającej granicę miasta" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Druga nazwa" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "fotoradar" @@ -14268,5 +15407,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Telefon alarmowy" @@ -14274,5 +15413,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14280,5 +15419,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14287,10 +15426,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "bród" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Edycja brodu" @@ -14298,5 +15437,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "przełęcz" @@ -14304,5 +15443,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Edycja przełęczy" @@ -14310,11 +15449,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 "Wysokość" @@ -14322,5 +15461,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Przeszkody" @@ -14328,5 +15467,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "słupek drogowy" @@ -14334,5 +15473,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Edycja słupka drogowego" @@ -14377,16 +15516,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 "" @@ -14395,5 +15534,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14401,5 +15540,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "przeszkoda dla bydła" @@ -14407,10 +15546,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Edycja przeszkody dla bydła" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "" @@ -14418,15 +15557,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Kolczatka" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Edycja kolczatki" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "punkt poboru opłat" @@ -14434,5 +15573,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Edycja punktu poboru opłat" @@ -14440,10 +15579,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "przejście graniczne" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Edycja przejścia granicznego" @@ -14453,5 +15592,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "żywopłot" @@ -14460,5 +15599,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "ogrodzenie" @@ -14467,5 +15606,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "mur" @@ -14473,5 +15612,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "mury miejskie" @@ -14480,5 +15619,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "mur oporowy" @@ -14490,15 +15629,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Wejście" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Edycja wejścia" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "brama" @@ -14506,50 +15645,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Edycja bramy" #. 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 "przełaz" @@ -14557,25 +15696,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Edycja przełazu" #. 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 "" @@ -14586,10 +15725,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 "zbiornik wodny" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "źródło" @@ -14597,5 +15736,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "plaża" @@ -14603,5 +15742,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "odpływ" @@ -14609,10 +15748,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Edycja odpływu" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "strumień" @@ -14620,10 +15759,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Edycja strumienia" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "kanał" @@ -14631,10 +15770,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Edycja kanału" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "rzeka" @@ -14644,5 +15783,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 "Edycja rzeki" @@ -14650,15 +15789,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Edycja zbiornika wodnego" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "ląd" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Edycja lądu" @@ -14666,15 +15805,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "zbiornik wodny" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Edycja zbiornika wodnego" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "sztuczne jezioro" @@ -14682,15 +15821,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Edycja sztucznego jeziora" #. 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 "" @@ -14698,5 +15837,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "" @@ -14705,10 +15844,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 "mokradło" @@ -14719,14 +15858,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 "Edycja mokradła" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "bagno" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "torfowisko" @@ -14740,35 +15879,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "marsze" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "szuwary" -#: 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 "tereny zalewowe" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "namorzyny" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "błota" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Edycja błot" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "plaża" @@ -14776,20 +15915,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Edycja plaży" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "zatoka" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Edycja zatoki" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "klif" @@ -14797,10 +15936,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Edycja klifu" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "wybrzeże" @@ -14808,5 +15947,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Edycja zbiornika gazu" @@ -14814,5 +15953,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "trasa promu" @@ -14820,5 +15959,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Edycja trasy promu" @@ -14827,5 +15966,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "stocznia" @@ -14833,10 +15972,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Edycja stoczni" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "dok" @@ -14844,5 +15983,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Edycja doku" @@ -14850,5 +15989,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Tama" @@ -14856,15 +15995,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Edycja tamy" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Punkty drogi wodnej" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "wrota śluzy" @@ -14873,5 +16012,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "jaz" @@ -14879,20 +16018,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Edycja jazu" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "wodospad" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Edycja wodospadu" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "" @@ -14901,15 +16040,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Edycja mariny" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "molo" @@ -14917,10 +16056,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Edycja molo" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "terminal promowy" @@ -14928,10 +16067,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Edycja terminalu promowego" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "pochylnia" @@ -14941,5 +16080,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 "Edycja pochylni" @@ -14947,10 +16086,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Kolej" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "tor" @@ -14958,5 +16097,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Edycja toru" @@ -14986,8 +16125,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 "Rodzaj (opcjonalne)" @@ -15001,35 +16140,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 "dworzec przetokowy" -#: 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 "bocznica" -#: 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 "odnoga" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "kolej wąskotorowa" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Edycja toru kolei wąskotorowej" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "tor jednoszynowy" @@ -15037,45 +16176,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Edycja toru jednoszynowego" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "kolej retro" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Edycja kolei retro" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "trasa szybkiego tramwaju" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Edycja trasy szybkiego tramwaju" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Edycja toru metra" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "tramwaj" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Edycja torów tramwajowych" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "" @@ -15083,5 +16222,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15090,14 +16229,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "nieużywany tor" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Edycja opuszczonych torów" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "nieczynny tor" @@ -15106,5 +16245,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "przejazd kolejowy" @@ -15113,5 +16252,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "przejazd przez tory" @@ -15121,5 +16260,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Rodzaj przejazdu" @@ -15127,5 +16266,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "obrotnica" @@ -15134,10 +16273,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Koleje linowe" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "wyciąg krzesełkowy" @@ -15145,10 +16284,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Edycja wyciągu krzesełkowego" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "wyciąg orczykowy" @@ -15156,10 +16295,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Edycja wyciągu orczykowego" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "kolej linowa" @@ -15167,10 +16306,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Edycja kolei linowej" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15178,5 +16317,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15184,5 +16323,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 "stacja" @@ -15193,10 +16332,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 "Edycja stacji" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "stacja benzynowa" @@ -15206,9 +16345,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 "Edycja stacji benzynowej" #. 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 "godziny otwarcia" + +#. 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" @@ -15228,106 +16596,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Edycja parkingu" #. 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 "Numer referencyjny" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "wielopoziomowy" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "powierzchnia" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "podziemny" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "parkuj i jedź" + +#. 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 "Opłata" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Pojemność" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Miejsca dla niepełnosprawnych" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Miejsca dla niepełnosprawnych" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Miejsca dla niepełnosprawnych" + +#: 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 "Myjnia samochodowa" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Edycja myjni samochodowej" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "warsztat" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Edycja warsztatu samochodowego" + +#. 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 "wypożyczalnia" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Edycja wypożyczalni samochodów" + +#. 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 "Edycja parkingu dla rowerów" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Pojemność" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "powierzchnia" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "wielopoziomowy" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "podziemny" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "parkuj i jedź" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Miejsca dla niepełnosprawnych" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Opłata" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Myjnia samochodowa" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Edycja myjni samochodowej" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "warsztat" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Edycja warsztatu samochodowego" - -#. 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 "wypożyczalnia" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Edycja wypożyczalni samochodów" - -#. 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 "Edycja parkingu dla rowerów" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Edycja wypożyczalni rowerów" @@ -15336,15 +16739,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Edycja warsztatu rowerowego" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transport publiczny" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -15352,5 +16755,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "przystanek kolejowy" @@ -15358,5 +16761,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Edycja przystanku kolejowego" @@ -15364,5 +16767,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "przystanek tramwajowy" @@ -15371,5 +16774,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Edycja przystanku tramwajowego" @@ -15377,5 +16780,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Platforma kolejowa" @@ -15384,5 +16787,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Edytuj platformę kolejową" @@ -15394,5 +16797,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 "Oznaczenie (numer toru)" @@ -15400,10 +16803,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 "obszar" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "wejście do metra" @@ -15412,10 +16815,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Edycja wejścia do metra" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "dla niepełnosprawnych" @@ -15424,5 +16827,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "dworzec autobusowy" @@ -15431,5 +16834,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Edycja dworca autobusowego" @@ -15437,5 +16840,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Przystanek autobusowy" @@ -15445,5 +16848,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 "Edycja przystanku autobusowego" @@ -15452,8 +16855,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 "schronienie" @@ -15461,10 +16862,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 "" @@ -15472,5 +16873,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "taksówki" @@ -15478,5 +16879,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Edycja postoju taksówek" @@ -15484,5 +16885,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "lotnisko" @@ -15490,15 +16891,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Edycja lotniska" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15507,5 +16908,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Zakwaterowanie" @@ -15517,5 +16918,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "hotel" @@ -15524,15 +16925,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Edycja hotelu" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Gwiazdki" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "motel" @@ -15540,20 +16941,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Edycja motelu" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "kwatera" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Edycja kwatery turystycznej" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "chata górska" @@ -15561,10 +16962,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Edycja chaty górskiej" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "hostel" @@ -15572,30 +16973,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Edycja hostelu" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "chata alpejska" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Edycja chaty alpejskiej" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "kemping" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Edycja kempingu" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "pole namiotowe" @@ -15603,10 +17004,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Edycja pola namiotowego" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Wyżywienie" @@ -15617,5 +17018,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "restauracja" @@ -15623,5 +17024,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Edycja restauracji" @@ -15629,5 +17030,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 "Kuchnia" @@ -15635,61 +17036,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 "włoska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chińska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburgery" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "grecka" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "niemiecka" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indyjska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regionalna" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turecka" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "azjatycka" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "tajska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "meksykańska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japońska" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "fast food" @@ -15697,9 +17098,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Edycja restauracji fast-food" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "kawiarnia" @@ -15707,10 +17108,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Edycja kawiarni" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "pub" @@ -15718,20 +17118,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Edycja pubu" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "ogródek piwny" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Edycja ogródka piwnego" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "bar" @@ -15739,10 +17137,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Edycja baru" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "klub nocny" @@ -15750,33 +17147,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Edycja klubu nocnego" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turystyka" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "atrakcja" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Edycja atrakcji turystycznej" -#. 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 "godziny otwarcia" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "muzeum" @@ -15784,10 +17172,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Edycja muzeum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "zoo" @@ -15796,10 +17183,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Edycja zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "punkt widokowy" @@ -15807,25 +17193,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Edycja punktu widokowego" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "wieża widokowa" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "park rozrywki" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Edycja parku rozrywki" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "sztuka" @@ -15833,5 +17218,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Edycja obiektu sztuki" @@ -15839,86 +17224,210 @@ #. 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 "Mapa" #. 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 "mapa" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "mapa miasta" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "mapa tras pieszych" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "mapa tras rowerowych" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "znak stop" + +#. 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 "ulica" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chińska" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Pobierany obszar" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Wklej" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "miasto" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regionalna" #. 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 "kolarstwo" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "szlak górski" + +#. 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 "narciarstwo" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "bocznica" + +#. 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 "Rodzaj tablicy" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "tablica informacyjna" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "przejście graniczne" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "dla początkujących" + +#: build/trans_presets.java:1737 msgid "history" msgstr "tablica historyczna" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "tablica przyrodnicza" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "tablica o zwierzętach" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "zagospodarowanie przestrzenne" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Informacje" + +#. 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 "Opis symboli" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Dźwięk" + +#. +#: 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 "Numer telefonu" + +#. 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 "Edycja schronienia" @@ -15926,25 +17435,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 "miejsce na ognisko" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "miejsce na piknik" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Edycja miejsca na piknik" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Miejsca historyczne" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "zamek" @@ -15953,20 +17462,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Edycja zamku" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "ruiny" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Edycja ruin" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Wykopaliska archeologiczne" @@ -15975,10 +17483,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Edycja wykopalisk archeologicznych" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "pole bitwy" @@ -15986,5 +17493,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Edycja pola bitwy" @@ -15992,15 +17499,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "pomnik" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Edycja pomnika" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "miejsce pamięci" @@ -16008,45 +17515,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Edycja miejsca pamięci" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "krzyż przydrożny" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Edycja krzyża przydrożnego" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "kapliczka" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Edycja kapliczki" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Rozrywka" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "park wodny" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Edycja parku wodnego" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "plac zabaw" @@ -16054,15 +17561,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Edycja placu zabaw" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "miejsce do wędkowania" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Edycja miejsca do wędkowania" @@ -16070,15 +17577,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "obiekty sportowe" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Edycja stadionu" @@ -16092,6 +17599,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 "wybierz sport:" @@ -16483,30 +17990,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 "sport" @@ -16516,227 +18023,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 "różne sporty" -#: 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 "łucznictwo" -#: 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 "lekkoatletyka" -#: 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 "baseball" -#: 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 "siatkówka" -#: 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 "bule" -#: 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 "gra w kule" -#: 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 "kajakarstwo" -#: 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 "wspinaczka" -#: 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 "krykiet" -#: 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 "krokiet" -#: 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 "kolarstwo" -#: 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 "wyścigi psów" -#: 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 "jazda konna" -#: 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 "football" -#: 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 "golf" -#: 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 "gimnastyka" -#: 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 "hokej" -#: 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 "wyścigi konne" -#: 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 "sporty motorowe" -#: 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 "pelota" -#: 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 "rugby" -#: 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 "strzelectwo" -#: 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 "jazda na deskorolce" -#: 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 "łyżwiarstwo" -#: 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 "narciarstwo" -#: 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 "piłka nożna" -#: 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 "pływanie" -#: 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 "tenis stołowy" -#: 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 "tenis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "centrum sportowe" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Edycja centrum sportowego" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "boisko" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Edycja boiska" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "tor wyścigowy" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Edycja toru wyścigowego" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "pole golfowe" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Edycja pola golfowego" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "miniaturowy golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Edycja miniaturowego golfa" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "różne sporty" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "" @@ -16775,248 +18280,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 "boisko" -#: 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 "centrum sportowe" -#: 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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "kręgle" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Edycja kręgli" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "lekkoatletyka" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Edycja" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "łucznictwo" #. 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 "wspinaczka" #. 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 "kajakarstwo" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "kolarstwo" - -#. 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 "wyścigi psów" #. 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 "jeździectwo" #. 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 "wyścigi konne" #. 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 "gimnastyka" #. 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 "sporty motorowe" #. 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 "łyżwiarstwo" #. 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 "jazda na deskorolce" #. 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 "pływanie" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "narciarstwo" - #. 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 "Rodzaj trasy" #. 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 "Poziom trudności" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "dla początkujących" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "łatwa" -#: 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 "dla ekspertów" -#: 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 "strzelectwo" @@ -17024,178 +18521,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 "Sporty z piłką" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "piłka nożna" #. 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 "football" #. 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 "australijski football" #. 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 "baseball" #. 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 "koszykówka" #. 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 "golf" #. 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 "pole golfowe" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "bule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Edycja boiska do gry w boule" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "gra w kule" #. 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 "krykiet" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Edycja boiska do gry w krykieta" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "krykiet - siatki" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Edycja siatek do treningu gry w krykieta" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "krokiet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Edycja miejsca do gry w krokieta" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "hokej" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Edycja miejsca do gry w hokeja" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Edycja miejsca do gry w pelotę" -#: 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 "rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Edycja miejsca do gry w rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "tenis stołowy" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Edycja miejsca do gry w tenis stołowy" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "tenis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Edycja miejsca do gry w tenisa" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Budynki" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "budynek" @@ -17203,5 +18700,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "budynek użyteczności publicznej" @@ -17209,10 +18706,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Edycja budynku użyteczności publicznej" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "ratusz" @@ -17220,10 +18717,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Edycja ratusza" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "ambasada" @@ -17231,10 +18728,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Edycja ambasady" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "sąd" @@ -17243,10 +18740,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Edycja siedziby sądu" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "więzienie" @@ -17255,10 +18752,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Edycja więzienia" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "posterunek policji" @@ -17268,10 +18765,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 "Edycja posterunku policji" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "straż pożarna" @@ -17280,10 +18777,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Edycja posterunku straży pożarnej" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "poczta" @@ -17291,5 +18788,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Edycja urzędu pocztowego" @@ -17297,15 +18794,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "przedszkole" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Edycja przedszkola" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "szkoła" @@ -17313,10 +18810,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Edycja szkoły" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "uniwersytet" @@ -17324,10 +18821,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Edycja uniwersytetu" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "college" @@ -17335,5 +18832,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Edycja college'u" @@ -17341,5 +18838,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "kino" @@ -17348,10 +18845,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Edycja kina" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "biblioteka" @@ -17360,10 +18857,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Edycja biblioteki" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "centrum kulturalne" @@ -17371,10 +18867,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Edycja centrum kulturalnego" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "teatr" @@ -17383,10 +18879,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Edycja teatru" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "miejsce kultu religijnego" @@ -17396,5 +18892,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 "Edycja miejsca kultu religijnego" @@ -17403,6 +18899,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 "Religia" @@ -17411,66 +18907,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 "bahaizm" -#: 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 "buddyzm" -#: 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 "chrześcijaństwo" -#: 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 "hinduizm" -#: 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 "dżinizm" -#: 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 "judaizm" -#: 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 "islam" -#: 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 "sikhizm" -#: 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 "spirytualizm" -#: 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 "taoizm" -#: 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 "zaratusztrianizm" -#: 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 "Wyznanie" @@ -17479,81 +18975,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 "kościół anglikański" -#: 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 "baptyści" -#: 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 "kościół katolicki" -#: 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 "ewangelikalizm" -#: 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 "świadkowie Jehowy" -#: 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 "luteranie" -#: 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 "metodyści" -#: 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 "mormoni" -#: 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 "kościół prawosławny" -#: 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 "zielonoświątkowcy" -#: 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 "prezbiterianie" -#: 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 "protestanci" -#: 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 "kwakrzy" -#: 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 "szyici" -#: 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 "sunnici" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresy" @@ -17562,5 +19058,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Edycja informacji o adresach" @@ -17568,5 +19064,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Numer domu" @@ -17574,20 +19070,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nazwa domu" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Nazwa miejscowości" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Kod pocztowy" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Kod kraju" @@ -17595,5 +19091,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolacja adresów" @@ -17602,5 +19098,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Edycja interpolacji adresów" @@ -17608,71 +19104,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Sposób numeracji domów" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "nieparzyste" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "parzyste" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "wszystkie" - -#: 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 "Obiekty sztuczne" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "zakład produkcyjny" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Edycja zakładu produkcyjnego" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "wieża" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Edycja wieży" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "wieża ciśnień" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Edycja wieży ciśnień" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "zbiornik gazu" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Edycja zbiornika gazu" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "latarnia morska" @@ -17680,10 +19172,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Edycja latarni morskiej" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "wiatrak" @@ -17691,10 +19183,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Edycja wiatraka" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "rurociąg" @@ -17702,10 +19194,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Edycja rurociągu" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "oczyszczalnia ścieków" @@ -17715,10 +19207,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 "Edycja oczyszczalni ścieków" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "dźwig" @@ -17726,10 +19218,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Edycja dźwigu" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "radiolatarnia" @@ -17737,10 +19229,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Edycja radiolatarni" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "punkt geodezyjny" @@ -17748,10 +19240,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Edycja punktu geodezyjnego" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "monitoring" @@ -17759,5 +19251,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Edycja kamery do monitoringu" @@ -17765,5 +19257,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "źródło energii elektrycznej" @@ -17773,39 +19265,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 "Edycja źródła energii elektrycznej" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "wiatrowa" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "wodna" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "cieplna" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "jądrowa" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "węglowa" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "fotowoltaiczna" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gazowa" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "elektrownia" @@ -17814,10 +19306,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Edycja elektrowni" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "rozdzielnia elektryczna" @@ -17826,5 +19318,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Edycja rozdzielni elektrycznej" @@ -17832,10 +19324,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 "oznaczenie linii" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "słup elektryczny" @@ -17846,5 +19338,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 "Edycja słupa linii wysokiego napięcia" @@ -17852,5 +19344,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "linia wysokiego napięcia" @@ -17859,46 +19351,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Edycja linii wysokiego napięcia" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Napięcie" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Ilość przewodów" #. 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 "toalety" -#. 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 "Numer referencyjny" - #. 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 "Uwagi" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "skrzynka pocztowa" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "telefon" @@ -17907,5 +19393,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Edycja telefonu" @@ -17913,5 +19399,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 "na monety" @@ -17919,5 +19405,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 "na banknoty" @@ -17925,5 +19411,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 "na karty chipowe" @@ -17931,5 +19417,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 "na karty debetowe" @@ -17937,15 +19423,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 "na karty kredytowe" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "na karty telefoniczne" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "zbiórka odpadów" @@ -17954,5 +19440,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Edycja punktu zbiórki odpadów" @@ -17960,80 +19446,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "puszki" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "odzież" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "szkło" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "złom" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "ławka" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Ambona myśliwska" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Edycja ambony strzelniczej" -#. 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 "Wysokość" + +#. 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 "Ukryj" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Zablokuj" -#. 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 "Wysokość" - -#. 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 "fontanna" @@ -18042,10 +19524,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Edycja fontanny" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "woda do picia" @@ -18054,10 +19536,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Edycja punktu z wodą pitną" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -18065,25 +19547,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 "Sklepy" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Edycja supermarketu" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "chata górska" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Edycja chaty górskiej" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "sklepik" @@ -18091,10 +19583,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Edycja sklepiku" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "kiosk" @@ -18102,10 +19593,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Edycja kiosku" -#. 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 "Edycja przystanku autobusowego" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Edycja drzewa" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "automat sprzedający" @@ -18113,5 +19623,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Edycja automatu sprzedającego" @@ -18119,88 +19629,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Sprzedawane produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "bilety komunikacji miejskiej" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "mapy komunikacji miejskiej" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "bilety parkingowe" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "jedzenie" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "napoje" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "słodycze" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "papierosy" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "zdjęcia" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "jedzenie dla zwierząt" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "gazety" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "zabawki" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "znaczki" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "karty 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 "vouchery" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "prezerwatywy" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampony" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "torby na odchody" #. 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 "rzeźnik" @@ -18208,10 +19718,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Edycja sklepu mięsnego" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "piekarnia" @@ -18219,10 +19728,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Edycja piekarni" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "florysta" @@ -18230,20 +19738,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Edycja kwiaciarni" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "naturalna żywność" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Edycja sklepu z naturalną żywnością" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "monopolowy" @@ -18251,60 +19757,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 "napoje" #. 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 "komputery" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Edycja sklepu komputerowego" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "elektronika" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Edycja sklepu z elektroniką" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "sprzęt hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Edycja sklepu ze sprzętem hi-fi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "meble" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Edycja sklepu meblowego" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "centrum ogrodnicze" @@ -18312,10 +19812,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Edycja centrum ogrodniczego" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "" @@ -18323,10 +19822,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 "sklep DIY" @@ -18334,60 +19832,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Edycja sklepu DIY (zrób to sam)" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "artykuły biurowe" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Edycja sklepu z artykułami biurowymi" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "fryzjer" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Edycja salonu fryzjerskiego" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "obuwie" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Edycja sklepu obuwniczego" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "zabawki" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Edycja sklepu z zabawkami" -#. 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 "pralnia chemiczna" @@ -18395,10 +19887,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Edycja palni chemicznej" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "pralnia samoobsługowa" @@ -18406,10 +19897,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "wyspa" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "sklep turystyczny" @@ -18417,35 +19907,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Edycja sklepu ze sprzętem turystycznym" -#. 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 "Edycja sklepu sportowego" -#. 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 "Edycja optyka" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Gotówka" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "bank" @@ -18453,16 +19940,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Edycja banku" -#. 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 "bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "kantor" @@ -18470,5 +19955,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Edycja kantoru" @@ -18476,15 +19961,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Edycja bankomatu" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Zdrowie" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "lekarz" @@ -18492,20 +19977,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Edycja lekarza" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "dentysta" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Edycja dentysty" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "apteka" @@ -18513,5 +19996,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Edycja apteki" @@ -18519,10 +20002,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "realizacja recept" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "szpital" @@ -18530,10 +20012,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Edycja szpitala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "" @@ -18542,5 +20024,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18549,20 +20031,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Numer punktu" #. 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 "Numer telefonu" #. 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 "(Podaj razem z kodem kraju, np.: +12-345-67890)" @@ -18570,5 +20052,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 "weterynarz" @@ -18577,55 +20059,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Edycja lecznicy weterynaryjnej" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "kontynent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Edycja kontynentu" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "kraj" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Edycja kraju" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "stan" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Edycja stanu" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Edycja regionu" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "okręg" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Edycja okręgu / hrabstwa" @@ -18633,15 +20115,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "miasto" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Edycja miasta" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "miejscowość" @@ -18649,10 +20131,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Edycja miejscowości" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "dzielnica" @@ -18660,25 +20142,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Edycja dzielnicy" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "wieś" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Edycja wsi" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "wólka" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Edycja wólki" @@ -18686,5 +20168,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "okolica" @@ -18692,10 +20174,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Edycja okolicy" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "wyspa" @@ -18703,11 +20185,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Edycja wyspy" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "w lewo" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Edycja chaty górskiej" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "wejście do jaskini" @@ -18715,10 +20210,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Edycja wejścia do jaskini" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "wzgórze" @@ -18726,10 +20221,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Edycja wzgórza" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "lodowiec" @@ -18737,10 +20232,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Edycja lodowca" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "wulkan" @@ -18748,70 +20243,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Edycja wulkanu" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Granice" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "narodowa" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Edycja granicy narodowej" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "administracyjna" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Edycja granicy administracyjnej" #. 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 "Edycja granicy politycznej" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "park narodowy" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Edycja granicy parku narodowego" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Zagospodarowanie terenu" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "drzewo" @@ -18820,15 +20315,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Edycja drzewa" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Nazwa systematyczna" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "las" @@ -18837,5 +20332,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Edycja lasu" @@ -18843,17 +20338,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 "iglasty" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "liściasty" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "mieszany" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "las" @@ -18862,14 +20357,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Edycja lasu" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "rezerwat przyrody" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Edycja rezerwatu przyrody" @@ -18877,25 +20372,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "rumowisko" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Edycja rumowiska" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "busz" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Edycja buszu" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "turnia" @@ -18903,10 +20398,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Edycja turni" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "wrzosowisko" @@ -18914,5 +20409,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Edycja wrzosowiska" @@ -18920,5 +20415,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "zagroda" @@ -18927,45 +20422,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Edycja zagrody" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "grunty rolne" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Edycja gruntów rolnych" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "łąka" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Edycja łąki" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "winnica" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Edycja winnicy" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "ogródki działkowe" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Edycja ogródków działkowych" @@ -18973,25 +20468,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "ogród" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Edycja ogrodu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Trawa" #. 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 "" @@ -18999,10 +20494,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 "miejsce publiczne" @@ -19010,20 +20505,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Edycja miejsca publicznego" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Edycja parku" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Teren rekreacyjny" @@ -19031,5 +20526,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Edycja terenu rekreacyjnego" @@ -19037,15 +20532,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "zabudowa mieszkaniowa" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Edycja zabudowy mieszkaniowej" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "cmentarz" @@ -19053,9 +20548,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Edycja cmentarza" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "cmentarz" @@ -19063,39 +20558,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Edycja cmentarza" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "handel" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Edycja obszaru handlowego" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "biura i usługi" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Edycja obszaru biur i usług" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "teren przemysłowy" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Edycja terenu przemysłowego" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "teren kolejowy" @@ -19103,15 +20598,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Edycja terenu kolejowego" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "obszar wojskowy" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Edycja obszaru wojskowego" @@ -19119,55 +20614,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "budowa" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Edycja terenu budowy" #. 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 "teren pod zabudowę" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Edycja terenu pod zabudowę" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "wysypisko" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Edycja wysypiska śmieci" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "kamieniołom" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Edycja komieniołomu" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "" @@ -19177,5 +20672,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 "" @@ -19184,10 +20679,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "zewnętrzny segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "wewnętrzny segment" @@ -19195,5 +20690,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "ograniczenia skrętu" @@ -19202,5 +20697,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Edycja ograniczenia skrętu" @@ -19208,34 +20703,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Ograniczenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "brak skrętu w lewo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "brak skrętu w prawo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "zakaz jazdy prosto" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "zakaz zawracania" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "nakaz skrętu w prawo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "nakaz skrętu w lewo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "nakaz jazdy prosto" @@ -19244,15 +20739,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "z drogi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "przez węzeł lub drogę" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "do drogi" @@ -19260,5 +20755,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Trasa" @@ -19267,5 +20762,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Edytuj trasę" @@ -19273,5 +20768,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Typ trasy" @@ -19343,5 +20838,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 @@ -19350,17 +20845,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 "droga" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "prom" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "" @@ -19413,5 +20908,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 @@ -19420,13 +20915,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 "tramway" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "objazd" @@ -19440,10 +20935,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Opis symboli" @@ -19451,31 +20946,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Sieć" #. 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 "proponowany" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternatywny" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "tymczasowy" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "połaczenie" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Kolor (hex)" @@ -19484,30 +20979,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 "" @@ -19945,11 +21440,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 "przestarzały" @@ -20275,41 +21770,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 "ulica" #. color street @@ -22010,5 +23468,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 "" @@ -22607,55 +24065,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22669,5 +24078,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 "turystyka" @@ -22739,8 +24148,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 "historia" @@ -22811,8 +24220,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 "zielony" @@ -22826,5 +24235,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "kamieniołom" @@ -22838,5 +24247,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "Wysypisko smieci" @@ -22858,5 +24267,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "Basen" @@ -22870,5 +24279,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "las" @@ -22882,5 +24291,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22903,5 +24312,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22915,5 +24324,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "Teren przemysłowy" @@ -22927,5 +24336,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22939,5 +24348,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22951,5 +24360,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "Teren kolejowy" @@ -23006,7 +24415,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 "Teren wojskowy" @@ -23020,5 +24429,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cmentarz" @@ -23031,5 +24440,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "szczyt" @@ -23044,5 +24453,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "lodowiec" @@ -23056,5 +24465,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "wulkan" @@ -23109,8 +24518,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 "" @@ -23124,5 +24533,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23136,20 +24545,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "zdrowie" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "Las naturalny" - #. color water #. 1 @@ -23160,5 +24557,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "błoto" @@ -23172,5 +24569,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "plaża" @@ -23248,8 +24645,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 "droga" @@ -23297,7 +24694,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 "granica" @@ -23439,10 +24836,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 "Miejsce" @@ -23490,6 +24896,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 "adres" @@ -23786,4 +25192,49 @@ msgstr "Terraserver Urban" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check " +#~ "conditions for no layer\"." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Usuń {1} {0}" + +#~ msgid "Delete Layer" +#~ msgstr "Usuń warstwę" + +#~ msgid "Authors: {0}" +#~ msgstr "Autorzy: {0}" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "citymap" +#~ msgstr "mapa miasta" + +#~ msgid "hikingmap" +#~ msgstr "mapa tras pieszych" + +#~ msgid "bicyclemap" +#~ msgstr "mapa tras rowerowych" + +#~ msgid "Board Type" +#~ msgstr "Rodzaj tablicy" + +#~ msgid "board" +#~ msgstr "tablica informacyjna" + #~ msgid "Move" #~ msgstr "Przenieś" @@ -23807,7 +25258,4 @@ #~ msgstr "Zmień" -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach" - #~ msgid "unnamed" #~ msgstr "bez nazwy" @@ -23815,7 +25263,4 @@ #~ msgid "Data Layer" #~ msgstr "Warstwa danych" - -#~ msgid "Not implemented yet." -#~ msgstr "Jeszcze nie zaimplementowane." #~ msgid "my version:" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 17484) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 17485) @@ -8,6 +8,6 @@ "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-17 00:13+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:12+0000\n" "Last-Translator: Maurorjb \n" "Language-Team: Brazilian Portuguese \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Criando tela principal" #. 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 "Ajuda" -#: ../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 "A projeção {0} nâo pode ser ativada. Usando Mercator" -#: ../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 @@ -96,154 +99,160 @@ #: ../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 "Erro" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Dica: Algumas alterações vieram ao enviar novos dados para o servidor." - -#: ../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] "Existem modificações não-salvas. Descartar alterações e continuar?" +msgstr[1] "Existem modificações não-salvas. Descartar alterações e continuar?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Alterações Não Salvas" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Existem modificações não-salvas. Descartar alterações e continuar?" - -#: ../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 "Salvar e Sair" -#: ../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 "Descartar e Sair" -#: ../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 "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL malformada: \"{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 "Aviso" -#: ../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 "Ignorando arquivo malformado: \"{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 "Não foi possível ler arquivo ''{0}''. O erro é:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,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" @@ -306,5 +316,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" @@ -328,6 +338,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 "Extensões" @@ -342,8 +352,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 "" "AVISO: formato inesperado de URL de base do API. O redirecionamento para a " @@ -351,9 +361,19 @@ "de base do API é: ''{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 "" +"AVISO: formato inesperado de URL de base do API. O redirecionamento para a " +"página de histórico de primitiva do OSM provavelmente não funcionará. A URL " +"de base do API é: ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Por favor, selecione pelo menos um nó, caminho ou relação." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -364,5 +384,5 @@ "primitivas selecionadas" -#: ../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 "Por favor a camada destino" @@ -372,11 +392,11 @@ msgstr "Selecione camada destino" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Combinar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -387,5 +407,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Sem camadas destino" @@ -402,11 +422,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 @@ -435,5 +455,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 "Latitude" @@ -442,30 +462,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 "Longitude" +#: ../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 "Alinhar Nós em círculo" -#: ../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 "Mover nós selecionados em um círculo" -#: ../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 @@ -479,6 +499,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 @@ -486,58 +506,57 @@ msgstr "Ferramenta: {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 "Por favor, selecione no mínimo 4 nós." #. 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 "Informações" #. 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 "Alinhar Nós em linha" -#: ../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 "Mover os nós selecionados para uma linha." -#: ../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 "Por favor, selecione no mínimo 3 nós." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -548,10 +567,10 @@ "número atual é {0}, o máximo é {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 "Violação de Capacidades da API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -562,5 +581,5 @@ "deletada {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -571,9 +590,9 @@ "máximo permitido de {2}. O tamanho é {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Violação de Précondição" -#: ../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}" @@ -581,37 +600,37 @@ "{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "dados" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "camada" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "seleção" -#: ../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 "conflito" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "baixar" +#: ../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 "Aproximar para {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 "Aproximar a visão para {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 @@ -621,22 +640,22 @@ msgstr "Visão: {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 "Não há nada selecionado para se aproximar." -#: ../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 "Não há conflitos para se aproximar" +#: ../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 "Combinar Caminhos" -#: ../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 "Combinar vários caminho em um só" -#: ../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 "Por favor selecione no mínimo 2 caminhos a combinar" @@ -647,4 +666,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Combinar assim mesmo" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -654,19 +677,7 @@ "mesmo assim?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Combinar assim mesmo" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Inverter direções?" - -#: ../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 "" -"Os caminhos não podem ser combinados nas direções atuais. Pretendes inverter " -"algum destes?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -674,27 +685,34 @@ msgstr "Inverter e Combinar" -#: ../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 "" +"Os caminhos não podem ser combinados nas direções atuais. Pretendes inverter " +"algum destes?" + +#: ../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 "Entrada de valores para todos conflitos" -#: ../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 "Resolver conflitos" -#: ../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 "Combinar {0} caminhos" -#: ../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 "Todos caminhos estavam vazios" -#: ../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 " @@ -704,32 +722,32 @@ "único conjunto de nós)" +#: ../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 "Copiar" -#: ../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 "Copiar objetos selecionados para memória de colagem" -#: ../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 "Por favor selecione algo a ser copiado" +#: ../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 "Criar Círculo" -#: ../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 "Criar círculo a partir de três nós selecionados." -#: ../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 "Os nós não estão em circulo. Abortando." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../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 +759,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 "Excluir" @@ -764,86 +782,87 @@ msgstr "Excluir os objetos selecionados." -#: ../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 "Sobrescrever" -#: ../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 "O arquivo já existe. Sobrescrever?" #. 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 "Distribuir nós" -#: ../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 "Distribuir nós selecionados equidistantemente sobre uma linha." +#: ../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 "Baixar do 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 "Baixar mapa do servidor 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 "Arquivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Baixar" -#: ../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 "Por favor selecione no mínimo uma tarefa para baixar" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "" "Descarregamento primitivas referenciadas a uma das primitivas selecionadas" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Baixando referencias..." -#: ../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 "Houve {0} conflitos durante a importação." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Conflitos durante download" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -852,6 +871,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 "Duplicar" @@ -875,85 +894,91 @@ msgstr "Sair do aplicativo." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Todas as imagens" + +#: ../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 "Exportar para 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 "Exportar dados para arquivo 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 "Nada a exportar. Escolha alguns dados antes." -#: ../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 "parâmetro \"{0}\" não pode ser vazio" -#: ../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 "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exportar arquivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Ajuda Online do 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 "Abrir no Navegador Web" -#: ../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 "Editar" -#: ../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 "Recarregar" -#: ../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 "Pode-se editar somente páginas de ajuda online do JOSM" -#: ../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 "Erro ao carregar página {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." msgstr "Faltando página de Ajuda. Crie uma em português." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1008,22 +1033,26 @@ msgstr "Combinar camada atual em outra camada" +#: ../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 "Unir Nós" -#: ../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 "Unir nós no mais antigo" -#: ../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 "Por favor selecione no mínimo dois nós para unir." -#: ../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 "Unir nós com usuários diferentes?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Unir mesmo assim" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1033,78 +1062,74 @@ "uni-los?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Unir mesmo assim" - -#: ../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 "" "Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado." -#: ../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 "Unir {0} nós" +#: ../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 "Combinar seleção" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Combinar primitivas selecionadas atualmente em outra camada" +#: ../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 "Espelhar" -#: ../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 "Espelhar os nós e caminhos selecionados." -#: ../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 "Por favor selecione ao menos um nó ou caminho." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "acima" -#: ../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 "Mover objetos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "abaixo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "esquerda" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "direita" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Mover {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 "Move Objetos {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 "Não é possível mover objetos para fora do planeta." @@ -1112,5 +1137,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 "Novo" @@ -1120,17 +1145,22 @@ msgstr "Criar novo mapa." -#: ../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 "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Abrir um arquivo." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Não foi possível ler arquivo ''{0}''. O erro é:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Abrir um arquivo." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Regra desconhecida \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1168,24 +1198,18 @@ msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Somente dois nós permitidos" -#: ../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 "Seleção deve consistir em somente dois caminhos" -#: ../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 "" "Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Por favor selecione caminhos com ângulos praticamente retos para " -"ortogonalização" - -#: ../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 " @@ -1194,9 +1218,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 "Somente um nó selecionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -1212,15 +1236,28 @@ msgstr "Colar conteúdo da memória" -#: ../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 "Colar Tags" -#: ../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 "" "Aplicar tags de conteúdo da memória de transferência em todos itens " "selecionados." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Desfazendo exclusão de {0} primitivas" +msgstr[1] "Desfazendo exclusão de {0} primitivas" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1246,37 +1283,32 @@ msgstr "Refazer a última ação não terminada." -#: ../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 "Renomear camada" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Também renomear o arquivo" -#: ../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 "Não foi possível renomear arquivo ''{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 "Reverter Caminhos" -#: ../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 "Reverter a direção de todos caminhos selecionados." -#: ../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 "Favor selecionar no mínimo um caminho." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Reverter caminhos" @@ -1284,10 +1316,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 "Salvar" #: ../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 "Salvar dados atuais" @@ -1298,37 +1331,25 @@ msgstr "Arquivo {0} já existe. Substituí-lo?" -#: ../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 "" -"Erro interno: Não é possível verificar condições sem nenhuma camada. Por " -"favor, relate isso como uma falha do programa." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Nenhum documento aberto, portanto não há nada a salvar." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Documento vazio" -#: ../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 "O documento não contém dados." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Salvar mesmo assim" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflitos" -#: ../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 " @@ -1338,28 +1359,28 @@ "se você rejeitar todos. Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Rejeitar Conflitos e Salvar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Salvar arquivo OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Salvar arquivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Salvar Camada" +#: ../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 "Salvar como..." -#: ../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 "Salvar os dados atuais para um novo arquivo." @@ -1393,33 +1414,33 @@ msgstr "Ajuda: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Relatório Atual" -#: ../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 "Copiar para área de transferência e fechar" -#: ../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 "Fechar" +#: ../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 "Dividir Caminho" -#: ../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 "Dividir caminho no nó selecionado" -#: ../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 "A seleção atual não pode ser usada para divisões" -#: ../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." @@ -1427,5 +1448,5 @@ msgstr[1] "Os nós selecionados não se encontram no meio de nenhum caminho" -#: ../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 " @@ -1441,9 +1462,9 @@ "o caminho também." -#: ../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 "Os nós selecionados não compartilham o mesmo caminho." -#: ../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." @@ -1451,11 +1472,11 @@ msgstr[1] "O caminho selecionado não contém todos nós selecionados." -#: ../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 "" "Você precisa selecionar dois ou mais nós para dividir um caminho circular." -#: ../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 " @@ -1465,5 +1486,5 @@ "no meio do caminho.)" -#: ../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 " @@ -1471,5 +1492,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 " @@ -1477,8 +1498,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 "Dividir caminho {0} em {1} partes" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Fechando conjunto de mudanças..." + +#: ../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 "Fechando conjunto de mudanças..." + +#: ../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 "Abrindo conjunto de mudanças..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Fechando conjunto de mudanças..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1496,58 +1542,58 @@ msgstr "Mudar a configuração global \"{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 "Desgrudar caminhos" -#: ../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 "Duplicar nós que são usados em caminhos múltiplos" -#: ../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 "Este nó não esta grudado a nada." -#: ../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 "Nenhum destes nós está grudado a algo." -#: ../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 "Nenhum dos nós destes caminhos está grudado a algo." -#: ../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 "A seleção atual não pode ser usada para desgrudar" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Selecione entre:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Um nó comentado, ou" -#: ../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 "* Um nó que é usado em mais de um caminho, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* Um nó que é usado em mais de um caminho e um destes caminhos, ou" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou" + #: ../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 "" -"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* Um caminho e um ou mais de seus nós que são usados por mais de um caminho." -#: ../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" @@ -1562,9 +1608,9 @@ "cópia e todos os nós serão selecionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nó não grudado" -#: ../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" @@ -1572,5 +1618,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" @@ -1615,61 +1661,71 @@ "Atualiza os dados da camada atual a partir do servidor (recarrega dados)" -#: ../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 "Enviando dados" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Atualizar Seleção" -#: ../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 "Atualiza as primitivas selecionadas a partir do servidor" -#: ../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 "Não há primitivas selecionadas para atualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Seleção vazia" -#: ../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 "Enviar para o 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 "Enviar todas as modificações ao servidor 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 "Há conflitos não resolvidos. Você deve resolvê-los primeiro." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Não há nada a enviar. Baixe dados primeiro." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Há conflitos não resolvidos. Você deve resolvê-los primeiro." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Não há modificações a enviar." -#: ../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 "Sincronizar {0} {1} apenas" -#: ../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 "Synchronizar todo o conjunto de dados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1690,17 +1746,17 @@ " para abortar e continuar editando.
" -#: ../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 "Detectado conflito" #. 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 "valor não esperado de retorno. Veio {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1715,5 +1771,5 @@ "
Clique {1} para abortar e continuar editando.
" -#: ../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}\"" @@ -1721,27 +1777,65 @@ "Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\"" -#: ../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 "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{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 "Envio falhou.
{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 "Envio para API OSM falhou" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Atualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Enviar estas modificações?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Enviar Modificações" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Editar nova relação na camada''{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 "Adicionar um novo nó a um caminho existente" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "enviar todas modificações em um pedido" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1751,31 +1845,80 @@ "usar uma chamada por primitiva" -#: ../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 "Faça um comentário breve sobre as mudanças que está enviando:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Configuração de Som" + +#: ../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 "conjunto de mudanças" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objetos a adicionar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objetos a modificar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objetos a excluir:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Faça um comentário breve sobre as mudanças que está enviando:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Enviar estas modificações?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Enviar Modificações" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Enviando" +#: ../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] "Objetos a adicionar:" +msgstr[1] "Objetos a adicionar:" + +#: ../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] "Objetos a modificar:" +msgstr[1] "Objetos a modificar:" + +#: ../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] "Objetos a excluir:" +msgstr[1] "Objetos a excluir:" + +#: ../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 "Última modificação em {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1799,20 +1942,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 "Áudio: {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 "Mais rápido" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Avanço Rápido" @@ -1854,10 +1997,10 @@ msgstr "Tocar marcador prévio." -#: ../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 "Lento" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Avanço Lento" @@ -1885,31 +2028,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 "Não há dados importados." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Dados 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 "Baixando {0} de {1} (faltam {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Enviando dados" - -#: ../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 "Erros ao Transferir" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1927,20 +2066,20 @@ "ignorar.
" -#: ../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 "Primitivas deletadas ou movidas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Apagar Modo" -#: ../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 "Apagar nós ou caminhos." -#: ../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 @@ -1949,5 +2088,5 @@ msgstr "Modo: {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 " @@ -1957,55 +2096,69 @@ "usados ao apagar um caminho. Ctrl: apaga objetos referentes." -#: ../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 "parâmetro ''{0}'' não pode ser nulo" +#: ../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 "Desenhar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Desenhar nós" -#: ../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 "Modo: Desenhar Foco" -#: ../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 @@ -2013,38 +2166,38 @@ msgstr "selecionado" -#: ../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 "Não é possível adicionar nó fora do planeta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Adicionar nó" -#: ../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 "Adicionar nó no caminho" -#: ../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 "Conectar caminho existente a nó" -#: ../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 "Adicionar um novo nó a um caminho existente" -#: ../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 "Adicionar nó em um caminho e conectar" -#: ../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 "Criar novo nó." -#: ../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 "Selecionar nó sob o cursor." -#: ../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." @@ -2053,14 +2206,14 @@ msgstr[1] "Inserir novo nó em {0} caminhos." -#: ../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 "Começar novo caminho a partir do último nó." -#: ../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 "Continuar caminho a partir do último nó." -#: ../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 "Finalizar desenho." @@ -2080,5 +2233,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 "Solte o botão do mouse para selecionar os objetos no retângulo." @@ -2090,5 +2243,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 "Solte o botão do mouse para parar de girar" @@ -2106,17 +2259,18 @@ "áudio dali. SHIFT+soltar para sincronizar o áudio naquele ponto." +#: ../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 "Selecionar" -#: ../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 "Selecionar, mover e girar objetos" -#: ../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" @@ -2125,13 +2279,21 @@ msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Mover elementos" -#: ../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 "Mova-os" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Desfazer mover" + +#: ../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 "" @@ -2140,13 +2302,9 @@ "Quer realmente movê-los?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Mova-os" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Desfazer mover" - -#: ../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." @@ -2155,5 +2313,5 @@ "próximo." -#: ../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-" @@ -2180,60 +2338,60 @@ "Abaixo, Direita; mova ampliação com o botão direito" +#: ../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 "Pesquisar..." -#: ../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 "Busca por objetos." -#: ../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 "Por favor, entre com uma string de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "susbtitui a seleção" -#: ../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 "adiciona à seleção" -#: ../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 "remove da seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "sensível à caixa alta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "expressão regular" -#: ../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 "Rua Augusta - 'Rua' and 'Augusta em qualquer chave ou valor." -#: ../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' em qualquer chave ou nome." -#: ../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:May - 'Bak' em qualquer parte do nome." -#: ../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 - chave 'type' com valor exato '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, " @@ -2243,57 +2401,58 @@ "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' não existe no nome." -#: ../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: - qualquer valor presente na chave=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 "Destinos especiais:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - tipo de objeto (nó, caminho, relação)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - tipo de objeto (nó, caminho, relação)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - todos os objetos modificados por determinado usuário" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objetos com um ID determinado" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objetos com um ID determinado" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nós:... - objeto com um determinado número de nós" -#: ../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 "modificado - todos os objetos modificados" -#: ../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 "selecionados - todos os objetos selecionados" -#: ../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 "incompletos - todos os objetos incompletos" -#: ../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 "não tagueados - todos objetos não tagueados" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expr - todos objetos filhos que coincidem com a expressão" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expr - todos objetos filhos que coincidem com a expressão" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "" "parent expr - all parents of objects matching the expression" @@ -2302,54 +2461,54 @@ "expressão" -#: ../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 "Use | ou OR para combinar com \"ou\" lógico" -#: ../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 "Usar \" para operadores de aspas (se a chave contém :)" -#: ../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 "Usar ( and ) para agrupar expressões" -#: ../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 "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../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 "Não há valores coincidentes para ''{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 "Nada adicionado à seleção pela busca por \"{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 "Nada foi removido da seleção quando buscado por \"{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 "Encontrados {0} resultados" -#: ../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" @@ -2420,58 +2579,96 @@ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Carregar Seleção" -#: ../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 "Contato {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Transferindo...." -#: ../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 "Não foi possível ler da URL: \"{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 "Erro processando URL: \"{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 "Erro de comunicação com o servidor." -#: ../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 "Adicionar nó" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Somar {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 "Editar relação #{0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Mudar {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 "Mudar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Modificar relação" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Remover \"{0}\" para {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Remover \"{0}\" para {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 "Remover \"{0}\" para {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Definir {0}={1} para {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 "Definir {0}={1} para {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Definir {0}={1} para {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" @@ -2480,10 +2677,10 @@ msgstr[1] "objetos" -#: ../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 "Remover \"{0}\" para {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}" @@ -2495,5 +2692,5 @@ msgstr "Mudar regra de membro da relação para {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2502,10 +2699,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 "Conflito duplo" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2514,5 +2711,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}''" @@ -2538,44 +2735,60 @@ msgstr "não foi possível resolver conflito não-definido" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Apagar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Apagar {1} {0}" - -#: ../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] "Apagar {1} {0}" +msgstr[1] "Apagar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Apagar Modo" +msgstr[1] "Apagar Modo" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Apagar {1} {0}" +msgstr[1] "Apagar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Deletar da relação" +msgstr[1] "Deletar da relação" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relação conflitando" -#: ../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 "Deletar da relação" + +#: ../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 "" "Seleção \"{0}\" é usada pela relação \"{1}\" com a regra {2}.\n" "Apagar da relação?" -#: ../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 "Deletar da relação" - -#: ../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 "" "Seleção \"{0}\" é usada pela relação \"{1}\".\n" "Apagar da relação?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Dividir segmento de via" @@ -2583,6 +2796,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." @@ -2594,5 +2807,5 @@ "
Realmente quer apagar?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Apagar confirmação" @@ -2603,5 +2816,5 @@ msgstr "Resolver conflitos em estado de exclusão em {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" @@ -2638,10 +2851,20 @@ msgstr "Resolver conflitos na lista de membros da relação {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Apagar membro de relação {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" @@ -2654,17 +2877,37 @@ msgstr "Sequência" -#: ../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 "Resolver {0} conflito de tag em {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 "Resolver {0} conflito de tag em {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Resolver {0} conflito de tag em {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Desfazendo exclusão de {0} primitivas" -#: ../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 "Resolver conflitos de versão para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Resolver conflitos de versão para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Resolver conflitos de versão para {0} {1}" @@ -2691,13 +2934,13 @@ "seus nós são sugeridas para manter a consistência dos dados." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relação" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Regra antiga" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nova regra" @@ -2716,64 +2959,123 @@ #: ../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 "Novo valor" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Aplicar alterações selecionadas" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Não aplicar alterações" -#: ../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 "Por favor, selecione quais alterações de propriedades quer aplicar." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Propriedades de " -#: ../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 "Regras em relações referentes a" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Correção automática de tags" -#: ../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 "Erro no arquivo de configuração nas linhas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Não foi possível abrir o diretório de preferências: {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 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" +"Falha ao difinir referência. Versão de referência {0} dnão disponível no " +"histórico" + +#: ../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 "" "O arquivo de preferência tinha erros. Fazendo cópia de segurança da versão " "antiga em {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 "Preferências gravadas em {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 "Não foi possível enviar preferências. Motivo: {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 "Não foi possível obter preferências do servidor." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2787,29 +3089,36 @@ msgstr "já registrado um conflito para a primitiva \"{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 "Graus decimais" -#: ../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 "Graus Minutos Segundos" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "L" -#: ../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}" @@ -2821,15 +3130,236 @@ msgstr "parametro {0} > 0 necessário. Obtido {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 "incompleto" - -#: ../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 "Erro: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Aviso: {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 "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{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 "Não há primitiva com versão {0} neste histórico" + +#: ../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 "Não há versão válida na data ''{0}'' neste histórico" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "parâmetro ''{0}'' no intervalo de 0..{1} esperado, obtido {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "não foi encontrada versão anterior. Histórico está vazio." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "não foi encontrada a última versão. Histórico está vazio." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." + +#: ../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 "" +"Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto de " +"dados" + +#: ../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 "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{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 "" +"não é possível comparar um primitivo com id ''{0}'' com um primitivo com 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 "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Caminho para Estilo de Área não está fechado." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "via multipolígonos \"{0}\" não está fechada." + +#. 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 "Membro vazio na relação." + +#: ../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 "Apagado membro ''{0}'' na relação." + +#: ../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 "Way ''{0}'' com menos de dois pontos." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Mais de um caminho \"de\" encontrado." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Mais de um caminho \"para\" encontrado." + +#: ../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 "Encontrado mais de um parâmetro \"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 "Regra desconhecida \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Tipo de membro desconhecido para \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Nenhum caminho \"de\" encontrado." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Nenhuma caminho \"para\" encontrado." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"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 "O caminho \"de\" não começa ou termina em um nó \"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 "O trecho \"to\" não começa ou termina no nó \"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 "O trecho \"from\" não começa ou termina no caminho \"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 "O trecho \"to\" não começa ou termina em um nó \"via\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Estilo para restrição {0} não encontrado." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Regra não aplicável ''{0}'' para Way ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "\"{0}\" não é um caminho no multipolígono." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Não há via externa no multipolígono \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Interseção entre as vias \"{0}\" e \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Via interna \"{0}\" está fora." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Estilo para caminho interno \"{0}\" é multipolígono." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Estilo para via externa \"{0}\" contém erros." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "não tagueado" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "texto" + +#. 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 "" +"Minha primitiva com id {0} e versão {1} é visível, mas sua primitiva com " +"versão menor {2} não é visível. Não é possível tratar esta inconsistência. " +"Mantendo minha primitiva. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inativo" + #: ../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" @@ -2838,22 +3368,7 @@ msgstr[1] "nós" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Erro: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Aviso: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nós" - -#: ../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" @@ -2862,12 +3377,7 @@ msgstr[1] "vias" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "caminhos" - -#: ../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" @@ -2876,253 +3386,4 @@ msgstr[1] "relações" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relações" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "conjunto de mudanças" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "conjunto de mudanças" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} membro" -msgstr[1] "{0} membros" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "rodovia" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "ferrovia" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "água" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "uso da terra" - -#: ../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} nó" -msgstr[1] "{0} nós" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Não há primitiva com versão {0} neste histórico" - -#: ../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 "Não há versão válida na data ''{0}'' neste histórico" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "parâmetro ''{0}'' no intervalo de 0..{1} esperado, obtido {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "não foi encontrada versão anterior. Histórico está vazio." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "não foi encontrada a última versão. Histórico está vazio." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." - -#: ../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 "" -"Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto de " -"dados" - -#: ../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 "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{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 "" -"não é possível comparar um primitivo com id ''{0}'' com um primitivo com 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 "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Caminho para Estilo de Área não está fechado." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "via multipolígonos \"{0}\" não está fechada." - -#. 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 "Membro vazio na relação." - -#: ../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 "Apagado membro ''{0}'' na relação." - -#: ../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 "Way ''{0}'' com menos de dois pontos." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Mais de um caminho \"de\" encontrado." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Mais de um caminho \"para\" encontrado." - -#: ../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 "Encontrado mais de um parâmetro \"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 "Regra desconhecida \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Tipo de membro desconhecido para \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Nenhum caminho \"de\" encontrado." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Nenhuma caminho \"para\" encontrado." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"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 "O caminho \"de\" não começa ou termina em um nó \"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 "O trecho \"to\" não começa ou termina no nó \"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 "O trecho \"from\" não começa ou termina no caminho \"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 "O trecho \"to\" não começa ou termina em um nó \"via\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Estilo para restrição {0} não encontrado." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Regra não aplicável ''{0}'' para Way ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "\"{0}\" não é um caminho no multipolígono." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Não há via externa no multipolígono \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Interseção entre as vias \"{0}\" e \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Via interna \"{0}\" está fora." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Estilo para caminho interno \"{0}\" é multipolígono." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Estilo para via externa \"{0}\" contém erros." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "não tagueado" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "texto" - -#. 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 "" -"Minha primitiva com id {0} e versão {1} é visível, mas sua primitiva com " -"versão menor {2} não é visível. Não é possível tratar esta inconsistência. " -"Mantendo minha primitiva. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inativo" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3135,5 +3396,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "segundo plano" @@ -3143,5 +3404,5 @@ msgstr "ressaltar" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "Geografia WGS84" @@ -3151,5 +3412,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3165,21 +3426,21 @@ "e comece uma nova camada na nova zona." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Zona Lambert (França)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Zona Lambert (Estônia)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Grade Suiça" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3199,9 +3460,9 @@ #: ../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 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Não foi possível ler arquivo ''{0}''. O erro é:
{1}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3209,12 +3470,60 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Não mostrar novamente" -#: ../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/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 "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "rodovia" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "ferrovia" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "água" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "uso da terra" + +#: ../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} nó" +msgstr[1] "{0} nós" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} membro" +msgstr[1] "{0} membros" + +#: ../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 "" "Falha em inicializar a comunicação com o servidor OSM {0}.\n" @@ -3222,5 +3531,43 @@ "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 "Desconhecido" + +#: ../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 "" @@ -3232,36 +3579,9 @@ "dados atual viola uma pré-condição.
A mensagem de erro é:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Violação de Pré-condição" -#: ../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 "Desconhecido" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3271,9 +3591,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "Exceção de segurança" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3282,9 +3602,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "Exceção de rede" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3293,9 +3613,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 "" @@ -3305,9 +3636,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Servidor desconhecido" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3320,12 +3651,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 "Primitiva já deletada" - -#: ../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 @@ -3342,38 +3668,38 @@ msgstr "Baixando \"Mensagem do Dia\"" -#: ../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 "Enviar Preferências" -#: ../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 "Enviar as preferências atuais para o servidor" -#: ../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 "sequência de texto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nome do usuário" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Senha do 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 "Redimensionar applet para geometria dada (formato: LARGURA x ALTURA)" -#: ../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 "string;string;..." -#: ../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 " @@ -3383,5 +3709,5 @@ "um arquivo" -#: ../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 " @@ -3391,5 +3717,5 @@ "lat=y&lon=x&zoom=z ou um nome de arquivo" -#: ../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 " @@ -3399,75 +3725,94 @@ "Google ou uma URL que retorne um osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "qualquer" -#: ../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 "Se especificado, resetar configuração ao invés de carregá-la." -#: ../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 "Nome do Usuário" -#: ../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 "Senha" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opções" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Mostar essa ajuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Argumento padrão de geometria 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 "Baixar o retângulo limite" -#: ../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 "Baixar o local da url (com 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 "Abrir arquivo (como raw gps, se .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 "Baixar o retângulo limite como dados de gps brutos" -#: ../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 "Selecionar dentro da busca" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Executar em modo maximizado" -#: ../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 "Resetar preferência para default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Escolha o idioma." -#: ../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 "exemplos" -#: ../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" @@ -3478,47 +3823,47 @@ "alguma coisa antes de --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 "Em vez de --download=, você pode especificar 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 "Ativando plugins atualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Carregando plugins anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Aplicando padrão" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Carregando plugins" -#: ../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." msgstr "Configuração {0} das preferências foi removida pois não é mais usada." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Arquivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Ferramentas" -#: ../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 "Predefinições" -#: ../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 @@ -3530,21 +3875,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 "Visão Wireframe" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Mudar para visão Wireframe" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Tela Cheia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Mudar para Tela Cheia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3584,59 +3929,45 @@ msgstr "Diminuir zoom" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "escala" -#: ../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 "A lontigute geográfica na posição do ponteiro do mouse." -#: ../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 "O nome do objeto na posição do ponteiro do mouse." -#: ../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 "A latitude geográfica na posição do ponteiro do mouse." -#: ../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 "O ângulo entre o segmento anterior e o atual." -#: ../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 "A direção (bússola) do segmento de linha que está sendo desenhado." -#: ../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 "O comprimento do novo caminho que está sendo desenhado." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(nenhum objeto)" -#: ../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 "camada não está na lista." -#: ../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 "Camada ''{0}'' precisa estar na lista de camadas" - -#: ../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 @@ -3647,10 +3978,4 @@ msgid "File not found" msgstr "Arquivo não encontrado" - -#: ../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 @@ -3711,7 +4036,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" @@ -3727,5 +4051,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" @@ -3832,5 +4156,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 "Minha versão" @@ -3841,5 +4165,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" @@ -3855,5 +4179,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 "Sua versão" @@ -3943,6 +4267,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" @@ -4060,10 +4384,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 "indice inesperado na coluna. Obtido {0}" -#: ../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 "" @@ -4074,19 +4398,19 @@ "" -#: ../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 "A comunicação com o servidor falhou" -#: ../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 "Sim, repô-los também" -#: ../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 "Não, cancelar operação" -#: ../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 "" @@ -4098,5 +4422,5 @@ "também?" -#: ../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 "Desfazer a remoção dos nós adicionais?" @@ -4116,9 +4440,9 @@ msgstr "Recuperar primitivas dependentes?" -#: ../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 "Propriedades de meus dados, ou seja, os dados locais" -#: ../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 " @@ -4128,95 +4452,97 @@ "meus elementos quando decisões de combinação forem aplicadas." -#: ../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 "Propriedades nos dados dele(s), ou seja, o servidor de dados" -#: ../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 "Coordenadas:" -#: ../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 "Estado excluído:" -#: ../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 "Estado Visível:" -#: ../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 "(nenhum)" -#: ../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 "removido" -#: ../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 "não apagado" -#: ../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 "visível (no servidor)" -#: ../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 "não visível (no servidor)" -#: ../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 "Mantenha uma cópia da versão local" -#: ../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 "Eliminar fisicamente os dados locais" -#: ../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 "Manter minhas coordenadas" -#: ../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 "Mantenha suas coordenadas" -#: ../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 "Não decidir conflito entre diferentes coordenadas" -#: ../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 "Manter meu estado de apagado" -#: ../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 "Manter seu estado suprimido" -#: ../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 "Manter meu estado visível" -#: ../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 "Sim, resetar 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 "Não, abortar" -#: ../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 "" " Para manter a sua versão local, o JOSM
precisa reiniciar o id de " @@ -4224,17 +4550,17 @@ "id.
Você concorda? " -#: ../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 "Resetar id para 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 "Manter seu estado visível" -#: ../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 "Sim, limpe-o" -#: ../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 "" @@ -4245,21 +4571,21 @@ "
Concorda? " -#: ../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 "Remover do conjuto de dados" -#: ../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 "Regra" #: ../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 "Primitivo" @@ -4300,10 +4626,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 @@ -4312,10 +4639,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 @@ -4329,5 +4657,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}" @@ -4368,4 +4696,140 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Seus dados não inclui uma tag com a chave {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 "nenhum" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "todos os números" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Selecionar uma cor" + +#: ../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 "parametro ''{0}'' não é um tipo válido para nome, obtido ''{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 "parâmetro ''{0}'' não pode ser nulo" + +#: ../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 "parâmetro ''{0}'' no intervalo de 0..{1} esperado, obtido {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 "não apagado" + +#: ../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 +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 "do caminho" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Deletar da relação" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Conflitos nos dados" + +#: ../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} via" +msgstr[1] "{0} vias" + +#: ../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} relação" +msgstr[1] "{0} relações" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Resolução de Conflito" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Resolver conflitos" + +#: ../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 "Aplicar" + +#: ../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 "Colar" + +#: ../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} via" +msgstr[1] "{0} vias" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4381,10 +4845,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 @@ -4392,5 +4856,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}" @@ -4421,5 +4885,5 @@ #: ../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." @@ -4428,31 +4892,25 @@ "acima." -#: ../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 "Cancelar a resolução de conflitos e fechar a janela" -#: ../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 "Aplicar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Aplicar a resolução" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "Fechar assim mesmo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Continuar resolvendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4464,152 +4922,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 "Conflito não resolvido completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Resolver conflitos" -#: ../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 "Histórico" -#: ../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 "Mostrar histórico de todos itens selecionados." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -" Falha ao carregar histórico a partir do servidor. Detalhes:
{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 "índice fora dos limites. Obtido {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 "Nó {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 "Camada: {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 "Relações: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Historia do iten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Carregar histórico" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Carregando histórico para {0} com 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 "Recarregar todos objetos selecionados e atualizar a lista." #. 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 "Mostrar" -#: ../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 "Mostrar histórico da primitiva selecionada" -#: ../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 "Camadas" -#: ../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 "Abrir uma lista com camadas carregadas." -#: ../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 "Excluir camada selecionada." -#: ../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 "Excluir Camada" - -#: ../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 "" - -#: ../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 "Confirmação" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "Sim" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "Não" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Apagar tudo" - -#: ../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 "Mostrar/Ocultar" -#: ../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 "Mudar estado de visibilidade do layer selecionado." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "Ativar" -#: ../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 "Ativar camada selecionada" -#: ../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 "Combinar esta camada em outra camada" -#: ../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 "Mover a camada selecionada uma linha acima." -#: ../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 "Mover camada selecionada uma linha abaixo." -#: ../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 "Informação sobre camada" -#: ../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 +5042,22 @@ msgstr[1] "Isto modificará {0} objetos." -#: ../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 "Um valor vazio apaga a chave." -#: ../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 "Modificar valores?" -#: ../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" @@ -4648,89 +5066,84 @@ msgstr[1] "Modificar propriedades de até {0} objetos" -#: ../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 "Por favor, selecione uma chave" -#: ../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 "Por favor, selecione um valor" -#: ../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 "Por favor, selecione os objetos que deseja modificar propriedades." -#: ../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 "Propriedades/Associações" -#: ../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 "Propriedades dos objetos selecionados." #. 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 "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Adicionar Propriedades" -#: ../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 "Adicionar" -#: ../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 "Adicionar um novo par chave/valor para todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Editar Propriedades" -#: ../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 "Editar o valor da chave selecionada para todos objetos" -#: ../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 "Propriedades: {0} / Membros: {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 "Propriedades / Associações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Modificar relação" -#: ../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 "Confirmar a exclusão da relação {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 "Excluir a chave selecionada em todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Excluir Propriedades" @@ -4739,34 +5152,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 "Relações" -#: ../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 "Abrir uma lista de de todas as relações." -#: ../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 "Relações: {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 "Abrir um editor para a relação selecionada" -#: ../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 "Excluir a relação selecionada" -#: ../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 "Criar uma nova relação" -#: ../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 "Criar uma cópia desta relação e abri-la em outra janela de edição" @@ -4799,23 +5212,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 "Seleção" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} via" -msgstr[1] "{0} vias" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relação" -msgstr[1] "{0} relações" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4823,14 +5222,9 @@ msgstr "Seleção: {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 "Desacoplar painel" -#: ../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." @@ -4838,64 +5232,99 @@ "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." -#: ../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 "Clique para minimizar/maximizar o conteúdo do painel" -#: ../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 "Autores" -#: ../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 "Abrir lista de pessoas trabalhando nos objetos selecionados." -#: ../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] "Autor" +msgstr[1] "Autor" + +#: ../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 "Mostrar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Mais informações sobre esta característica" + +#: ../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 "" +"AVISO: lançando janela do browser para somente as primeiras {0} das {1} " +"primitivas selecionadas" + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "Nº de objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autores: {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 "Editar relação referente à relação selecionada atualmente" -#: ../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 "Baixar relações selecionadas" -#: ../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 "Baixar membros do relaçoe" -#: ../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 "Conflitos nos dados" -#: ../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 "" @@ -4904,48 +5333,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 "Relação está apagada" -#: ../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 "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}" -#: ../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 "Tags e Membros" -#: ../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 "Relações de parentesco" -#: ../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 "" -"Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: {0}" - #. --- 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 "Regra:" -#: ../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 " @@ -4954,14 +5376,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 "Apagá-los, limpar relação" -#: ../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 "Ignorá-los, deixar relação como está" -#: ../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 "" @@ -4971,9 +5393,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 "Múltiplos membros referenciando a mesma primitiva" -#: ../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 "" @@ -4983,5 +5405,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" @@ -4990,5 +5412,5 @@ "membro" -#: ../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" @@ -4997,5 +5419,5 @@ "membro" -#: ../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 " @@ -5005,5 +5427,5 @@ "membro selecionado" -#: ../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 " @@ -5013,20 +5435,20 @@ "membro selecionado" -#: ../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 "Editor de Relações: Remover Selecionada" -#: ../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 "" @@ -5035,57 +5457,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 "Classificar a relação de membros" #. 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 "Editor de Relações: Classificar" -#: ../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 "Mover os membros selecionados para cima" #. 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 "Editor de Relações: Mover para cima" -#: ../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 "Mover membros selecionados para baixo" #. 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 "Editor de Relações: Mover para Baixo" -#: ../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 "Editor de Relações: Remover" -#: ../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 " @@ -5094,9 +5516,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 "" @@ -5105,20 +5527,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 "Aplicar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Aplicar atualizações e fechar aviso" -#: ../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 @@ -5128,37 +5546,37 @@ msgstr "Aceitar" -#: ../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 "Cancelar atualizações e fechar janela" -#: ../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 "Adicionar uma tag vazia" -#: ../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 "Apagar tags selecionadas atuais" -#: ../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 "Baixar todas vias imcompletas e nós desta relação" -#: ../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 "Baixar membros" -#: ../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 "Editor de Relações: Baixar Membros" -#: ../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 "Definir uma papel para membros selecionados" -#: ../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 "Aplicar papel" -#: ../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 "" @@ -5168,30 +5586,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 "" @@ -5205,22 +5623,27 @@ msgstr "Vinculado" -#: ../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 "Baixar relações referentes" -#: ../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 "incluir relações de parentesco diretas" -#: ../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 "Carregar relações de parentesco" -#: ../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 "Carregar relações de parentesco" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "Editar relação selecionada atualmente" @@ -5253,34 +5676,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] "Remover chaves antigas de até {0} objeto" -msgstr[1] "Remover chaves antigas de até {0} objetos" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Favoritos" -#: ../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 "Por favor, entre com as coordenadas desejadas primeiro." -#: ../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 "Por favor, entre com um nome para a location." -#: ../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 "Selecione um favorito primeiro" @@ -5338,13 +5748,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 "Null pointer exception, provavelmente faltam algumas tags." -#: ../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 "Por favor, entre com texto de busca" -#: ../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 "Não foi possível ler resultados de busca de place do servidor" @@ -5352,18 +5762,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 "Forneça o nome de um lugar a procurar:" -#. 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 "Lugares" #. 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 "nome" @@ -5402,37 +5811,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 "tipo" -#: ../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 "próximo" -#: ../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 "zoom" -#: ../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: " @@ -5444,5 +5853,5 @@ "teclas. Selecione: Clique." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Slippy map" @@ -5469,20 +5878,29 @@ msgstr "Número de quadros" -#: ../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 "Historia por {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 "Historia por {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Editar relação #{0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Fechar a janela" -#: ../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 "Mostrar histórico da primitiva selecionada" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" @@ -5490,11 +5908,11 @@ "referência." -#: ../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" @@ -5503,9 +5921,9 @@ "histórico" -#: ../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 "Histórico não inicializado ainda. Falha ao definir primitivo atual." -#: ../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" @@ -5513,8 +5931,27 @@ "Falha ao definir atual. Versão atual {0} não está disponível no histórico" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Nó {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Carregar histórico" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Carregando histórico para {0} com id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Carregando histórico para {0} com id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Carregando histórico para {0} com id {1}" #. item "Streets/Motorway" text "Reference" @@ -5832,14 +6269,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6015,8 +6466,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" #. @@ -6113,4 +6570,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6224,6 +6684,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 @@ -6231,156 +6691,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 "Nome" -#: ../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 "" "Versão {0} criada em {1} por " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "conjunto de mudanças" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Mais informações sobre esta característica" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Última modificação em {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6388,32 +6866,285 @@ msgstr "Verção {0} creado do {2} no {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Versão" -#: ../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 "Nome do rua" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Sim" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Não" + +#: ../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 "Por favor, selecione um valor" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Camada ''{0}'' precisa estar na lista de camadas" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Descartar e Sair" + +#: ../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 "Salvar e Sair" + +#: ../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 "Layer" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +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 "Arquivo" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Enviando" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Não há primitivas selecionadas para atualizar." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Imagens para {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 "Ler 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 "Sem tempo para ponto {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 "Não foi possível ler tempo \"{0}\" para ponto {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 "Não foram encontradas imagens com dados de tempo legíveis" -#: ../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 @@ -6421,29 +7152,29 @@ msgstr "Lendo {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 "Imagens Geotagueadas" -#: ../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 "Iniciar 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 "Finalizar 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 "delta atual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "diferença de zona horária: " -#: ../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" @@ -6452,14 +7183,14 @@ msgstr[1] "imagens" -#: ../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} dentro da faixa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sincronizar relógio" -#: ../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 @@ -6467,82 +7198,82 @@ msgstr "Imagens 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 "A data no arquivo \"{0}\" não pode ser analisada." -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Imagem" -#: ../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 "Digite data de exibição (mm/dd/aaaa HH:MM:SS)" -#: ../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 "Zona horária do GPS (diferença com foto)" -#: ../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 "Sincronizar Tempo com Unidade 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 "O tempo informado não pode ser analisado." -#: ../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 "ponto 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 "Personalizar linha" +#: ../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 "Usar preferências globais." + #: ../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 "Usar preferências globais." +msgid "Draw lines between points for this layer." +msgstr "Desenhar linhas entre pontos para esta camada." #: ../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 "Desenhar linhas entre pontos para esta camada." - -#: ../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 "Não desenhar linhas entre pontos para esta camada." -#: ../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 "Selecionar opções de linha" -#: ../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 "Personalizar cores" -#: ../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 "Padrão" -#: ../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 +7333,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 +7347,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 "Converter para camada de dados" #: ../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 +7361,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 (EN)" #: ../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 +7407,9 @@ "Você deseja
continuar? " +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Baixando dados" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6692,64 +7428,64 @@ msgstr "" -#: ../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 "Camada de dados {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 "fora da área baixada" -#: ../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 "versão {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 "Atenção: misturando dados de versões 0.6 e 0.5 na versão 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} consiste em:" -#: ../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} apagado.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "remover definição" -#: ../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 "Versão 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 "Converter para camada 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" @@ -6757,5 +7493,5 @@ msgstr[1] "trilhas" -#: ../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" @@ -6763,5 +7499,5 @@ msgstr[1] "pontos" -#: ../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" @@ -6770,5 +7506,5 @@ msgstr[1] "uma trilha com {0} pontos" -#: ../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" @@ -6777,5 +7513,5 @@ msgstr[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" @@ -6784,9 +7520,9 @@ msgstr[1] "{0} pontos" -#: ../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 "Marcador 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" @@ -6794,5 +7530,5 @@ msgstr[1] "marcadores" -#: ../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" @@ -6813,5 +7549,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}." @@ -6819,5 +7555,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 "Não foi possível sincronizar na camada sendo reproduzida." @@ -6845,5 +7581,5 @@ msgstr "Alternar visibilidade do marcador de texto e ícones." -#: ../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 " @@ -6851,5 +7587,5 @@ msgstr "" -#: ../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 " @@ -6857,29 +7593,29 @@ msgstr "" -#: ../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 "Não foi possível criar um novo marcador de áudio." -#: ../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 "Houve um erro na tentativa de mostrar a URL deste marcador" -#: ../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 "(A URL era: " -#: ../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 "Erro exibindo a 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 "Preferências Avançadas" -#: ../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 "Configurando Preferências diretamente. Use com cuidado!" -#: ../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 @@ -6887,27 +7623,27 @@ msgstr "Pesquisar: " -#: ../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 "Valor atual é o padrão." -#: ../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 "Valor padrão é \"{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 "" "Valor padrão atual é desconhecido (preferências não foram usadas ainda)" -#: ../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 "Por favor, selecione a linha para editar." -#: ../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 @@ -6915,14 +7651,14 @@ msgstr "Novo valor para {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 "Por favor, selecione a linha para apagar." -#: ../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 "Digite um novo par chave/valor" @@ -7056,40 +7792,40 @@ msgstr "Calibração do gravador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Cor" -#: ../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 "" -#: ../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 "Camada: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Escolher" -#: ../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 "Escolha uma cor para {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 "Definir para padrão" -#: ../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 "Definir todos para padrão" -#: ../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 "Cores utilizadas por diferentes objetos no JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Cores" @@ -7133,5 +7869,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Carro" @@ -7153,16 +7889,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 "Bicicleta" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7192,12 +7929,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 "A Pé" @@ -7370,5 +8107,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 "Mostrar tela de abertura ao iniciar" @@ -7376,23 +8113,32 @@ #. 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 "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +msgid "Show localized name in selection lists" +msgstr "" + +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +msgid "Show localized name in selection lists, if available" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Aparência" @@ -7424,54 +8170,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 "Lista de Download" -#: ../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 "Atualizar" -#: ../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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Configurações da tela" -#: ../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 " @@ -7479,41 +8225,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 "Configurações de conexão" -#: ../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 "" -#: ../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 "Configuração de Som" -#: ../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 "Você precicar reiniciar JOSM para aplicar mudanças." -#: ../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 "Mostra coordinados como" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Método de Projeção" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Projeção do Mapa" @@ -7545,12 +8291,4 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 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 "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" msgstr "" @@ -7578,61 +8316,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 "" -#: ../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:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 -#, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "Pagina: {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 "Versão: {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 "Copiar padrões" -#: ../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 "" -#: ../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 "" @@ -7798,36 +8535,59 @@ 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] "Remover chaves antigas de até {0} objeto" +msgstr[1] "Remover chaves antigas de até {0} objetos" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Adicionar uma tag vazia" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Excluir camada selecionada." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Mais informações sobre esta característica" #. 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 "Atributos opcionais:" -#: ../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 "Usar preferência ''{0}'' do grupo ''{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 "Usar preferencia ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "via sem saída" -#: ../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 "Tipo desconhecido: {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 @@ -7835,15 +8595,15 @@ msgstr "Não foi possível ler a fonte de preferência de tags: {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 "Erro analisando {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 "Elementos do tipo {0} são suportados." -#: ../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 @@ -7853,22 +8613,22 @@ msgstr[1] "Modificar objetos {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 "Nada selecionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Seleção inadequada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Aplicar Preferência" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Alterar propriedades" -#: ../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}''" @@ -7907,11 +8667,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 "Não foi possível ler \"{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 " @@ -7921,38 +8681,38 @@ "licenciadas pela 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 "Arquivos GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "Descrição da trilha do GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Adicionar informação do autor" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nome Real" -#: ../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 "Direitos autorais (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Pré-definido" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Ano dos direitos autorais" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Palavras-chave" @@ -7962,9 +8722,9 @@ msgstr "Opções de exportação" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportar e Salvar" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7975,10 +8735,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 "Escolha uma licença pré-definida" -#: ../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 @@ -7988,12 +8748,12 @@ msgstr "Marcadores de {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 "" -#: ../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" @@ -8014,6 +8774,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 @@ -8023,20 +8783,40 @@ msgstr "Baixando dados 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 "Editar relação # {0} na camada ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Nada adicionado à seleção pela busca por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8044,34 +8824,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Arquivos 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 "Coordenadas importadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Sentenças mal formadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Erros de consistência(checksum): " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Sentenças desconhecidas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Cordenadas Zero: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "importação NMEA bem sucedida" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "falha na importação NMEA" @@ -8082,9 +8862,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8093,15 +8873,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8109,33 +8889,91 @@ msgstr "" -#: ../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 "Abrindo conjunto de mudanças..." -#: ../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 "Abrindo conjunto de mudanças..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Abrindo conjunto de mudanças..." + +#: ../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 "Abrindo conjunto de mudanças..." + +#: ../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 "Fechando conjunto de mudanças..." -#: ../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 "Fechando conjunto de mudanças..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Abrindo conjunto de mudanças..." + +#: ../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 "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Enviando..." -#: ../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}." @@ -8163,42 +9001,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Senha ou usuário incorreto." -#: ../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 "Atenção: A senha é enviada sem encriptação." -#: ../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 "Salvar usuário e senha (sem encriptação)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Digite a Senha" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Login" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM senha" -#: ../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." @@ -8207,20 +9053,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Arquivos do servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8229,5 +9075,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8422,35 +9268,47 @@ "conexão de internet." -#: ../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} faltando. Subindo {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} faltando. Subindo {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} faltando. Subindo {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 "Não há nada a enviar. Baixe dados primeiro." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 +#, fuzzy +msgid "Starting to upload with one request per primitive ..." +msgstr "Falha ao apagar as primitivas selecionadas." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update Plugins" msgstr "Atualizar Plugins" -#: ../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 "" @@ -8463,5 +9321,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." @@ -8470,23 +9328,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8497,30 +9355,30 @@ msgstr "Um erro ocorreu com o plugin {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 "" -#: ../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 "O plugin {0} é requerido pelo plugin {1} mas não foi encontrado." -#: ../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 "Plugin não encontrado: {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 "Última atualização de plugin há mais de {0} dias." -#: ../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 " @@ -8530,21 +9388,21 @@ "aparecer
definindo a opção de configuração '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 "Desabilitar plugin" -#: ../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 "Não foi possível carregar plugin {0}. Apagar das preferências?" -#: ../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 " @@ -8554,5 +9412,5 @@ "de sobreescrever os existentes." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8560,10 +9418,10 @@ msgstr "Uma exceção não esperada pode ter ocorrido devido ao plugin ''{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 "De acordo com as informações no plugin, o autor é {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." @@ -8572,9 +9430,9 @@ "bug." -#: ../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 "O plugin deve ser desabilitado?" -#: ../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 " @@ -8584,13 +9442,13 @@ "desativar o plugin." -#: ../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" @@ -8601,5 +9459,5 @@ msgstr "Mais detalhes" -#: ../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" @@ -8608,18 +9466,18 @@ msgstr[1] "Informações de plugin baixadas de {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Não foi possível encontrar informações de plugin." -#: ../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 "" -#: ../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 "Todos os plugins estão atualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8632,9 +9490,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 "Baixando plugins que faltam" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8647,35 +9505,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}: Versão {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 "Plugin que vem junto com o 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 "Erro lendo o arquivo de plugin: {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 "Isto é após o fim da gravação." -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Erro reproduzindo som" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Não fazer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Relatar um Erro" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8689,18 +9547,18 @@ "a ultima versão do JOSM, por favor, reporte um bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Exceção Inesperada" -#: ../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 "Por favor, reporte um erro em {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 "Inclua os passos para repetir o erro (o mais detalhado possível)!" -#: ../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 " @@ -8710,13 +9568,13 @@ "bug." -#: ../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 "Tenha certeza de incluir a seguinte informação:" -#: ../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 "(O texto já foi copiado para a Área de Transferência)" -#: ../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}." @@ -8725,6 +9583,6 @@ "{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 "" @@ -8733,5 +9591,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8740,5 +9598,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8751,5 +9609,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" @@ -8759,5 +9617,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8768,17 +9626,17 @@ "\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 "(Dica: Você pode editar atalhos em preferências.)" -#: ../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 "" @@ -8787,4 +9645,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8809,9 +9702,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 @@ -8819,27 +9730,40 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Público" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in 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 (EN)" + +#: ../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 "Descrição" -#: ../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}" @@ -8847,47 +9771,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 "Conectando..." -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -8998,19 +9922,19 @@ msgstr "Carregar grupo de imagens como nova camada." -#: ../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 "Arcivo 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 "" -#: ../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 "Erro enquanto analisava {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." @@ -9019,34 +9943,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Sem data" -#: ../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 "" -#: ../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" @@ -9054,69 +9978,69 @@ msgstr "" -#: ../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 "Data inválida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Todas as imagens" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -9125,9 +10049,9 @@ msgstr "" -#: ../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 "" @@ -9136,65 +10060,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -9202,13 +10126,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valores Predefinidos" @@ -9229,5 +10153,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9240,12 +10164,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 "Selecionar Tudo" - -#: ../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 "Erro ao carregar arquivo" @@ -9276,6 +10199,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9284,21 +10207,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" @@ -9307,37 +10230,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 "" -#: ../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." @@ -9349,18 +10283,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9368,5 +10302,5 @@ msgstr "" -#: ../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). " @@ -9374,9 +10308,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Permitir empilhamento de camadas múltiplas" -#: ../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 "" @@ -9384,33 +10318,31 @@ "esquerda é mais transparente." -#: ../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 "" #. 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 "Multiplicador de avanço rápido" - -#: ../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 "" -#: ../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 "" -#: ../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 "Multiplicador de avanço rápido" - -#: ../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 "" @@ -9466,12 +10398,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contatando servidor OSM..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "Primitiva já deletada" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9505,20 +10435,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" @@ -9526,9 +10456,14 @@ 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 +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" @@ -9536,30 +10471,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "leste" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "norte" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Mantenha suas coordenadas" +msgid "Set " +msgstr "Selecionar" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9621,6 +10565,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)" @@ -9642,6 +10586,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 "" @@ -9657,7 +10601,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Camadas: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10177,6 +11121,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 "água" @@ -10189,8 +11133,4 @@ msgid "land" msgstr "terra" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "nenhum" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10473,9 +11413,9 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10484,5 +11424,5 @@ msgstr "" -#: ../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 "" @@ -11041,5 +11981,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 "Nome do rua" @@ -11058,29 +11998,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 "" @@ -11094,23 +12034,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 "Continuar assim mesmo" - -#: ../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 "" -#: ../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" @@ -11119,38 +12051,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -11158,81 +12090,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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?" @@ -11242,25 +12174,25 @@ msgstr[1] "" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Você tem certeza?" -#: ../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 "" @@ -11347,53 +12279,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 "Corrigir" -#: ../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 "Ignorar" -#: ../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 "Nada" -#: ../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" @@ -11418,20 +12350,50 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +#, fuzzy +msgid "Crossing buildings" +msgstr "Guarda de trânsito" + +#: ../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 +msgid "Nodes at same position" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Confirmação" + +#: ../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 "Duplicar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 "Apagar nós ou caminhos." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11514,23 +12476,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11539,7 +12501,7 @@ msgstr "" +#: ../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 "" @@ -11547,80 +12509,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11628,82 +12590,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691 msgid "Data sources" msgstr "Origens de dados" +#: ../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:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "" -#: ../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}''" @@ -11848,7 +12810,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 "" @@ -11862,5 +12824,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 "" @@ -11996,5 +12958,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -12039,14 +13001,14 @@ msgstr "" -#: ../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}" @@ -12057,26 +13019,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 "" -#: ../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 "" -#: ../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 " @@ -12084,37 +13046,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -12127,105 +13107,145 @@ 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 "Ativar" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 "Data inválida" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "WMS URL (Default)" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../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 "Copiar padrões" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Favor selecionar no mínimo um caminho." + +#: ../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 "Arcivo TCX (*.tcx)" #. * @@ -12585,62 +13605,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 "Referência" - -#. 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 "Layer" #. item "Streets/Motorway" combo "Layer" @@ -12655,5 +13620,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 "Faixas" @@ -12668,5 +13633,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" @@ -12676,10 +13640,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 "Velocidade máxima (km/h)" @@ -12723,9 +13687,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 "Mão Única" @@ -12773,13 +13737,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 "Ponte" @@ -12821,13 +13785,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 "Túnel" @@ -12867,12 +13831,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 "Corte" @@ -12912,12 +13876,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 "" @@ -13073,17 +14037,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 "Largura (metros)" @@ -13110,4 +14074,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" @@ -13126,11 +14091,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 "Superfície" @@ -13140,4 +14106,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" @@ -13152,9 +14119,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 "pavimentada" @@ -13162,10 +14130,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 "não pavimentada" + +#: 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 "Chalé" + +#: 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 "concreto" + +#: 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 "Aluguel" + +#. 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 "madeira" + +#: 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 "tíquetes de estacionamento" #. item "Ways/Track Grade 2" combo "Surface" @@ -13173,12 +14204,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 "pedras" + +#: 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 "seleção" + +#: 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 "incompleto" + +#: 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 "grama" + +#: 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 "grama" + +#: 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 "areia" + +#. 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 "terra" #. item "Streets/Residential" text "Width (meters)" @@ -13259,20 +14372,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 "Pedágio" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Sem saída" @@ -13285,8 +14398,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 "Acesso" @@ -13321,32 +14434,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 "sim" @@ -13359,40 +14487,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 "privado" -#: 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 "" @@ -13405,19 +14533,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 "" @@ -13440,65 +14568,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 "permitido" -#: 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 "não" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Carga" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Veículos de Carga Pesados" @@ -13513,10 +14646,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 "Cavalo" @@ -13532,17 +14665,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 "Motocicleta" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13554,30 +14686,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 "Automóvel" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Veículos de Serviço Público" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Barco motorizado" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Barco" #. 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 "Velocidade mínima (km/h)" @@ -13585,25 +14717,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 "Peso máximo (toneladas)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Altura máxima (metros)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Largura máx. (metros)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Comprimento Máx. (metros)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rotatória" @@ -13614,5 +14746,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 "Editar Junção" @@ -13628,5 +14760,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" #. @@ -13634,9 +14766,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 "Tipo" @@ -13656,10 +14788,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 "" @@ -13681,10 +14813,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 "" @@ -13706,10 +14838,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 "" @@ -13731,5 +14863,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" @@ -13744,9 +14876,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 "" @@ -13760,9 +14892,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 "" @@ -13792,10 +14924,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 "serviço" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "" @@ -13825,6 +14957,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 "construção" @@ -13835,10 +14967,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 "Editar Ponte" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Editar Túnel" @@ -13846,19 +14978,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Vias" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Construção" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Editar Rodovia em Construção" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Junção" @@ -13874,5 +15006,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rotatória" @@ -13881,5 +15013,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13887,5 +15019,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13893,5 +15025,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Ciclovia" @@ -13901,11 +15033,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 "Editar Ciclovia" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Faixa de Pedestres" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Calçada" @@ -13914,11 +15052,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Editar Calçada" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Barreiras" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "" @@ -13927,5 +15071,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Editar Calçadão" @@ -13933,5 +15077,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Escada" @@ -13941,5 +15085,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 "Editar Escadaria" @@ -13948,5 +15092,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Trilha" @@ -13955,39 +15099,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Editar Trilha" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "concreto" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "pedras" - -#. 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 "terra" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "grama" - -#: 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 "areia" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "" @@ -13996,5 +15112,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -14002,5 +15118,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -14009,5 +15125,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -14015,5 +15131,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -14022,5 +15138,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -14028,5 +15144,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -14035,5 +15151,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -14041,5 +15157,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -14048,5 +15164,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -14055,5 +15171,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Caminho" @@ -14062,19 +15178,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Edicar Caminho" -#: build/trans_presets.java:647 -msgid "Snowmobile" -msgstr "" - -#: build/trans_presets.java:650 +#: build/trans_presets.java:652 msgid "Ski" msgstr "Ski" +#: build/trans_presets.java:653 +msgid "Snowmobile" +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 "" @@ -14084,5 +15203,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 "" @@ -14090,5 +15209,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -14098,5 +15217,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 "" @@ -14104,5 +15223,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -14112,5 +15231,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 "" @@ -14118,5 +15237,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -14126,5 +15245,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 "" @@ -14132,5 +15251,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -14140,5 +15259,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 "" @@ -14146,5 +15265,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -14154,5 +15273,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 "" @@ -14160,10 +15279,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 "" @@ -14171,15 +15290,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 "Número" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Serviços" @@ -14187,5 +15306,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -14199,4 +15318,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" #. @@ -14216,18 +15337,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 "Operador" @@ -14236,5 +15359,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Sinal de Trânsito" @@ -14244,5 +15367,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Tipo de cruzamento de pedestres" @@ -14251,27 +15374,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 "faixa de pedestre (sem sinal)" -#: 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 "sinal de trânsito" -#: 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 "ilha" -#: 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 "sem faixa" #. 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 "Travessia à cavalo" @@ -14279,6 +15402,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 "Travessia de bicicleta" @@ -14287,11 +15410,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 "Guarda de trânsito" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "" @@ -14299,30 +15422,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 "Pare" @@ -14330,5 +15453,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Faixa de Pedestres" @@ -14337,14 +15460,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Editar Faixa de Pedestres" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rotatória" @@ -14355,14 +15478,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 "Direção" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "sentido horário" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "" @@ -14372,20 +15495,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 "Limite da Cidade" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Editar Placa de Limite da Cidade" #. 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 "Radar de Velocidade" @@ -14393,5 +15516,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Telefone de Emergência" @@ -14399,5 +15522,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Aclive" @@ -14405,5 +15528,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14412,10 +15535,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 "" @@ -14423,5 +15546,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14429,5 +15552,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14435,11 +15558,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 "Altitude" @@ -14447,5 +15570,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barreiras" @@ -14453,5 +15576,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14459,5 +15582,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14502,16 +15625,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 "" @@ -14520,5 +15643,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14526,5 +15649,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14532,10 +15655,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 "" @@ -14543,15 +15666,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 "" @@ -14559,5 +15682,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "" @@ -14565,10 +15688,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 "" @@ -14578,5 +15701,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14585,5 +15708,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14592,5 +15715,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "" @@ -14598,5 +15721,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "" @@ -14605,5 +15728,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14615,15 +15738,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Entrada" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Editar Entrada" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "" @@ -14631,50 +15754,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 "" @@ -14682,25 +15805,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 "" @@ -14711,10 +15834,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 "" @@ -14722,5 +15845,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "" @@ -14728,5 +15851,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14734,10 +15857,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 "" @@ -14745,10 +15868,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 "" @@ -14756,10 +15879,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 "" @@ -14769,5 +15892,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 "" @@ -14775,15 +15898,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 "" @@ -14791,15 +15914,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 "" @@ -14807,15 +15930,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 "" @@ -14823,5 +15946,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "" @@ -14830,10 +15953,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 "" @@ -14844,14 +15967,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 "" @@ -14865,35 +15988,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 "" @@ -14901,20 +16024,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 "" @@ -14922,10 +16045,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 "" @@ -14933,5 +16056,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "" @@ -14939,5 +16062,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "" @@ -14945,5 +16068,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14952,5 +16075,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14958,10 +16081,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 "" @@ -14969,5 +16092,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14975,5 +16098,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "" @@ -14981,15 +16104,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 "" @@ -14998,5 +16121,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -15004,20 +16127,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 "" @@ -15026,15 +16149,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 "" @@ -15042,10 +16165,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 "" @@ -15053,10 +16176,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 "" @@ -15066,5 +16189,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 "" @@ -15072,10 +16195,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 "" @@ -15083,5 +16206,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -15111,8 +16234,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 "" @@ -15126,35 +16249,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 "" @@ -15162,45 +16285,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 "Bonde/VLT" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Editar Bonde/VLT" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "" @@ -15208,5 +16331,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15215,14 +16338,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 "" @@ -15231,5 +16354,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15238,5 +16361,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15246,5 +16369,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15252,5 +16375,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15259,10 +16382,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 "" @@ -15270,10 +16393,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 "" @@ -15281,10 +16404,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 "" @@ -15292,10 +16415,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 "" @@ -15303,5 +16426,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15309,5 +16432,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 "Estação" @@ -15318,10 +16441,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 "Editar Estação" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Posto de Gasolina" @@ -15331,9 +16454,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 "Editar Posto de Gasolina" #. 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 "Horário de Funcionamento" + +#. 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" @@ -15353,47 +16705,73 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Editar Estacionamento" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" -msgstr "" +#. 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 "Número de Referência" #. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "" - +#: build/trans_presets.java:1393 +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:1388 build/trans_presets.java:2328 +#: build/trans_presets.java:1394 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 msgid "Fee" msgstr "Taxa" -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 +#. +#: build/trans_presets.java:1396 +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 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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 "Lava Jato" #. item -#: build/trans_presets.java:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "Editar Lava Jato" @@ -15401,5 +16779,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "Loja" @@ -15407,15 +16785,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "Editar Loja de Carros" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "Oficina" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "Editar Oficina" @@ -15423,5 +16801,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "Aluguel" @@ -15430,10 +16808,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "Editar Aluguel de Carros" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "Compartilhamento" @@ -15441,5 +16819,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "Editar Compartilhamento de Carro" @@ -15447,12 +16825,17 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" msgstr "Editar Bicicletário" +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" +msgstr "" + #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Editar Aluguel de Bicicletas" @@ -15461,15 +16844,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Editar Loja de Bicicletas" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transporte Público" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -15477,5 +16860,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15483,5 +16866,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15489,5 +16872,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Parada do Bonde/VLT" @@ -15496,5 +16879,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Editar Parada do Bonde/VLT" @@ -15502,5 +16885,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Plataforma de Trens" @@ -15509,5 +16892,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Editar Plataforma de Trens" @@ -15519,5 +16902,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 "" @@ -15525,10 +16908,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 "Entrada do Metrô" @@ -15537,10 +16920,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Editar Entrada do Metrô" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -15549,5 +16932,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Terminal de Ônibus" @@ -15556,5 +16939,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Editar Terminal de Ônibus" @@ -15562,5 +16945,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Ponto de Ônibus" @@ -15570,5 +16953,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 "Editar Ponto de Ônibus" @@ -15577,8 +16960,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 "Abrigo" @@ -15586,10 +16967,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Plataforma de Ônibus" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Editar Plataforma de Ônibus" @@ -15597,5 +16978,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Táxi" @@ -15603,5 +16984,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Editar Ponto de Táxi" @@ -15609,5 +16990,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Aeroporto" @@ -15615,15 +16996,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Editar Aeroporto" #. 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 "" @@ -15632,5 +17013,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Acomodação" @@ -15642,5 +17023,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -15649,15 +17030,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 "" @@ -15665,20 +17046,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 "Chalé" @@ -15686,10 +17067,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Editar Chalé" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Albergue" @@ -15697,30 +17078,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Editar Albergue" #. 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 "" @@ -15728,10 +17109,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 "Comida e Bebida" @@ -15742,5 +17123,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurante" @@ -15748,5 +17129,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Editar Restaurante" @@ -15754,5 +17135,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 "Cozinha" @@ -15760,61 +17141,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 "italiana" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chinessa" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hambúrguer" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "grega" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "alemã" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indiana" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regional" -#: 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 "turca" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiática" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "tailandesa" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexicana" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japonesa" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Lanchonete" @@ -15822,9 +17203,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Editar Lanchonete Fast-Food" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Café" @@ -15832,10 +17213,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Editar Café" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Bar/Pub" @@ -15843,20 +17223,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Editar Bar/Pub" -#. 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 "" @@ -15864,10 +17242,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 "Boate" @@ -15875,33 +17252,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Editar Boate" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turismo" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Atração" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Editar Atração Turística" -#. 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 "Horário de Funcionamento" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museu" @@ -15909,10 +17277,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Editar Museu" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoológico" @@ -15921,10 +17288,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Editar Zoológico" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Mirante" @@ -15932,25 +17298,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Editar Mirante" #. 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 "Parque Temático" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Editar Parque Temático" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Arte" @@ -15958,5 +17323,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Editar Arte" @@ -15964,86 +17329,210 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Centro de Informações Turísticas" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Editar Centro de Informações Turísticas" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Tipo de Mapa" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "mapa" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "mapa da cidade" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "mapa de ciclovias" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Pare" + +#. 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 "estrada" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chinessa" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Baixar Área" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Colar" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Cidade" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regional" #. 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 "Chafariz" + +#. 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 "indiana" + +#. 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 "Quadro de Informações" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Tipo de Quadro" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "quadro" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Editar Continente" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "Polícia" + +#: build/trans_presets.java:1737 msgid "history" msgstr "história" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "natureza" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "vida selvagem" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "uso da terra" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Informações" + +#. 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 "Descrição de símbolo" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: 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 "Número de telefone" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Outros Pontos de Informação" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Editar Abrigo" @@ -16051,25 +17540,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 "Lareira" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Campo de Picnic" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Editar Campo de Picnic" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Lugares Históricos" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Castelo" @@ -16078,20 +17567,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Editar Castelo" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruínas" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Editar Ruínas" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Sítio Arqueológico" @@ -16100,10 +17588,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Editar Sítio Arqueológico" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Campo de Batalha" @@ -16111,5 +17598,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Editar Campo de Batalha" @@ -16117,15 +17604,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monumento" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Editar Monumento" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Memorial" @@ -16133,45 +17620,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Editar Memorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Cruz de beira de estrada" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Editar Cruz de beira de estrada" #. 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 "Lazer" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Parque Aquático" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Editar Parque Aquático" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Parquinho" @@ -16179,15 +17666,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Editar Parquinho" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Pescaria" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Editar Pescaria" @@ -16195,15 +17682,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 "Estádio" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Editar Estádio" @@ -16217,6 +17704,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 "selecionar esporte:" @@ -16608,30 +18095,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 "esporte" @@ -16641,227 +18128,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 "multi" -#: 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 "arco e flecha" -#: 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 "atletismo" -#: 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 "futebol australiano" -#: 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 "baseball" -#: 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 "basquete" -#: 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 "boliche" -#: 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 "canoagem" -#: 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 "escalada" -#: 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 "críquete" -#: 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 "ciclismo" -#: 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 "corrida de cachorros" -#: 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 "futebol americano" -#: 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 "golfe" -#: 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 "ginástica olímpica" -#: 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 "hóquei" -#: 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 "corrida de cavalos" -#: 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 "automobilismo" -#: 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 "tiro" -#: 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 "esqui" -#: 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 "futebol" -#: 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 "natação" -#: 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 "ping-pong" -#: 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 "tênis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Centro de Esportes" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Editar Centro de Esportes" -#: 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 "Mini-Golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Editar Mini-Golf" -#. 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 "" @@ -16900,248 +18385,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 "estádio" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "" @@ -17149,178 +18626,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 "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Editar Campo de Baseball" -#: 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 "Construções" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "" @@ -17328,5 +18805,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Prédio Público" @@ -17334,10 +18811,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Editar Prédio Público" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Prefeitura" @@ -17345,10 +18822,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Editar Prefeitura" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Embaixada" @@ -17356,10 +18833,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Editar Embaixada" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Fórum" @@ -17368,10 +18845,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Editar Fórum" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Presídio" @@ -17380,10 +18857,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Editar Presídio" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Polícia" @@ -17393,10 +18870,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 "Editar Polícia" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Bombeiros" @@ -17405,10 +18882,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Editar Bombeiros" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Correios" @@ -17416,5 +18893,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Editar Correios" @@ -17422,15 +18899,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Creche" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Editar Creche" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Escola" @@ -17438,10 +18915,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Editar Escola" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universidade" @@ -17449,10 +18926,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Editar Universidade" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Faculdade" @@ -17460,5 +18937,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Editar Faculdade" @@ -17466,5 +18943,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Cinema" @@ -17473,10 +18950,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Editar Cinema" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Biblioteca" @@ -17485,10 +18962,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Editar Biblioteca" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Centro de Artes" @@ -17496,10 +18972,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Editar Centro de Artes" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teatro" @@ -17508,10 +18984,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Editar Teatro" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Lugar de Adoração" @@ -17521,5 +18997,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 "Editar Lugar de Adoração" @@ -17528,6 +19004,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 "" @@ -17536,66 +19012,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 "bahai" -#: 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 "budismo" -#: 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 "cristianismo" -#: 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 "hinduísmo" -#: 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 "jainismo" -#: 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 "judaísmo" -#: 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 "muçulmano" -#: 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 "sikhismo" -#: 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 "espiritismo" -#: 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 "taoísmo" -#: 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 "unitarianismo" -#: 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 "zoroastrianismo" -#: 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 "Denominação" @@ -17604,81 +19080,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 "anglicana" -#: 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 "batista" -#: 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 "católica" -#: 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 "evangélica" -#: 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 "testemunha de jeová" -#: 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 "luterana" -#: 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 "metodista" -#: 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 "mórmon" -#: 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 "ortodoxa" -#: 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 "pentecostal" -#: 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 "presbiteriana" -#: 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 "protestante" -#: 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 "quaker" -#: 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 "xiismo" -#: 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 "sunismo" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Endereços" @@ -17687,5 +19163,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Editar Informações de Endereço" @@ -17693,5 +19169,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Número da casa" @@ -17699,20 +19175,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nome da casa" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Cidade" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "CEP" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Código do país" @@ -17720,5 +19196,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolação de Endereços" @@ -17727,5 +19203,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Editar Interpolação de Endereços" @@ -17733,71 +19209,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Esquema de numeração" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "números ímpares" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "números pares" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "todos os números" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alfabético" -#: 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 "Fábrica" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Editar Fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Torre" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Editar Torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Torre de Água" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Editar Torre de Água" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasômetro" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Editar Gasômetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Farol" @@ -17805,10 +19277,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Editar Farol" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Moinho de Vento" @@ -17816,10 +19288,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Editar Moinho de Vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Cano" @@ -17827,10 +19299,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Editar Cano" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Estação de Tratamento de Esgoto" @@ -17840,10 +19312,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 "Editar Estação de Tratamento de Esgoto" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Guindaste" @@ -17851,10 +19323,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Editar Guindaste" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "" @@ -17862,10 +19334,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 "Vértice Geodésico" @@ -17873,10 +19345,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Editar Vértice Geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Câmera de Vigilância" @@ -17884,5 +19356,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Editar Câmera de Vigilância" @@ -17890,5 +19362,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Gerador de Energia" @@ -17898,39 +19370,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 "Editar Gerador de Energia" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "eólica" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hidrelétrica" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fóssil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nuclear" -#: 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 "carvão" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gás" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Estação de Energia" @@ -17939,10 +19411,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Editar Estação de Energia" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Subestação de Energia" @@ -17951,5 +19423,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Editar Subestação de Energia" @@ -17957,10 +19429,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 "Torre de Energia" @@ -17971,5 +19443,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 "Editar Torre de Energia" @@ -17977,5 +19449,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Linha de transmissão" @@ -17984,46 +19456,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Editar Linha de Transmissão" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Voltagem" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Quantidade de Cabos" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Comodidades" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Banheiros" -#. 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 "Número de Referência" - #. 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 "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Caixa de Correio" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefone" @@ -18032,5 +19498,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Editar Telefone" @@ -18038,5 +19504,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 "Moedas" @@ -18044,5 +19510,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 "Notas" @@ -18050,5 +19516,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 "" @@ -18056,5 +19522,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 "" @@ -18062,15 +19528,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 "Cartão de Crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Cartão Telefônico" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Reciclagem" @@ -18079,5 +19545,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "" @@ -18085,80 +19551,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Baterias" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Latas" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Roupas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Vidro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Ferro Velho" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Banco" -#. 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 -msgid "Hide" -msgstr "" - -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 -msgid "Lock" -msgstr "" - -#. item "Amenities/Hunting Stand" check "Lock" +#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" +#. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2371 build/trans_presets.java:2771 +#: build/trans_presets.java:2438 build/trans_presets.java:2899 msgid "Height" msgstr "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "low" msgstr "baixa" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "half" msgstr "" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2438 msgid "full" msgstr "" -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2440 +msgid "Hide" +msgstr "" + +#: build/trans_presets.java:2441 +msgid "Lock" +msgstr "" + +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Chafariz" @@ -18167,10 +19629,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Editar Chafariz" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Bebedouro" @@ -18179,10 +19641,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Editar Bebedouro" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -18190,25 +19652,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 "Lojas" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermercado" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Editar Supermercado" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Chalé" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Editar Chalé" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Loja de Conveniência" @@ -18216,10 +19688,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Editar Loja de Conveniência" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Quiosque" @@ -18227,10 +19698,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Editar Quiosque" -#. 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 "Editar Ponto de Ônibus" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Editar Árvore" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "" @@ -18238,5 +19728,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Editar Máquina de Vendas" @@ -18244,88 +19734,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Produtos à venda" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "tíquetes de transporte público" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "mapas de transporte público" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "tíquetes de estacionamento" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "comida" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "bebidas" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "doces" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigarros" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "ração animal" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "jornais" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "brinquedos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "selos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "Cartões 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 "preservativos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "absorventes" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "sacos para fezes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Cartões de fidelidade" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Açougue" @@ -18333,10 +19823,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Editar Açougue" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Padaria" @@ -18344,10 +19833,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Editar Padaria" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Floricultura" @@ -18355,20 +19843,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Editar Floricultura" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Orgânicos" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Editar Loja de Orgânicos" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Álcool" @@ -18376,60 +19862,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 "Bebidas" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Editar Loja de Bebidas" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Computador" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Editar Loja de Computador" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Eletrônicos" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Editar Loja de Eletrônicos" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Equipamentos de Áudio" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Editar Loja de Equipamentos de Áudio" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Móveis" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Editar Loja de Móveis" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Loja de Plantas" @@ -18437,10 +19917,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Editar Loja de Plantas" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "" @@ -18448,10 +19927,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Editar Loja de Utilidades Domésticas" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "" @@ -18459,60 +19937,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 "Papelaria" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Editar Papelaria" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Cabelereiro" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Editar Cabelereiro" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Sapatos" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Editar Loja de Sapatos" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Brinquedos" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Editar Loja de Brinquedos" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Locadora de Vídeo" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Editar Locadora de Vídeo" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Lavanderia à Seco" @@ -18520,10 +19992,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Editar Lavanderia à Seco" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Lavanderia" @@ -18531,10 +20002,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Editar Lavanderia" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "" @@ -18542,35 +20012,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 "Esportes" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Editar Loja de Esportes" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Óculos" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Editar Loja de Óculos" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Dinheiro" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banco" @@ -18578,16 +20045,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Editar Banco" -#. 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 "Caixa Eletrônico" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Loja de Câmbio" @@ -18595,5 +20060,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Editar Loja de Câmbio" @@ -18601,15 +20066,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Editar Caixa Eletrônico" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Saúde" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Médicos" @@ -18617,20 +20082,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Editar Médicos" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dentistas" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Editar Dentistas" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Farmácia" @@ -18638,5 +20101,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Editar Farmácia" @@ -18644,10 +20107,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 "Hospital" @@ -18655,10 +20117,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Editar Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Entrada de Emergência" @@ -18667,5 +20129,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Editar Entrada de Emergência" @@ -18674,20 +20136,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 "Número de telefone" #. 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 "(Use código internacional, como +12-345-67890)" @@ -18695,5 +20157,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 "Veterinária" @@ -18702,55 +20164,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Editar Veterinária" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Editar Continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "País" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Editar País" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Estado" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Editar Estado" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Região" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Editar Região" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Condado" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Editar Condado" @@ -18758,15 +20220,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Cidade" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Editar Cidade (mais que 100 mil habitantes)" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Cidade (menos que 100 mil habitantes)" @@ -18774,10 +20236,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Editar Cidade (menos que 100 mil habitantes)" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Bairro" @@ -18785,25 +20247,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Editar Bairro" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Vilarejo" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Editar Vilarejo" #. 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 "" @@ -18811,5 +20273,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18817,10 +20279,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 "Ilha" @@ -18828,11 +20290,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Editar Ilha" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "esquerda" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Editar Chalé" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Entrada de Caverna" @@ -18840,10 +20315,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Editar Entrada de Caverna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Pico" @@ -18851,10 +20326,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Editar Pico" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Geleira" @@ -18862,10 +20337,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Editar Geleira" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulcão" @@ -18873,70 +20348,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Editar Vulcão" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Fronteiras" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nacional" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Editar Fronteiras Nacionais" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrativo" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Editar Fronteiras Administrativas" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Editar Fronteiras Civis" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Político" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Editar Fronteiras Políticas" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Parque nacional" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Editar Fronteira de Parque Nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Uso da terra" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Árvore" @@ -18945,15 +20420,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Editar Árvore" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Nome Botânico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Floresta" @@ -18962,5 +20437,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Editar Floresta" @@ -18968,17 +20443,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 "conífera" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "decídua" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "misturado" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Floresta" @@ -18987,14 +20462,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 "Reserva Natural" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Editar Reserva Natural" @@ -19002,25 +20477,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 "Arbusto" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Editar arbusto" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "" @@ -19028,10 +20503,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Editar rocha" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Matagal" @@ -19039,5 +20514,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Editar matagal" @@ -19045,5 +20520,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -19052,45 +20527,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 "" @@ -19098,25 +20573,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Jardim" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Editar Jardim" #. 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 "" @@ -19124,10 +20599,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 "" @@ -19135,20 +20610,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 "Parque" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Editar Parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "área de recreação" @@ -19156,5 +20631,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -19162,15 +20637,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Área residencial" #. 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 "Cemitério" @@ -19178,9 +20653,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Editar Cemitério" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cemitério" @@ -19188,39 +20663,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 "Comercial" #. 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 "Industrial" #. 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 "" @@ -19228,15 +20703,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 "Militar" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "" @@ -19244,55 +20719,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Área de construção" #. 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 "Pedreira" #. 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 "Multipolígono" @@ -19302,5 +20777,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 "Editar Multipolígono" @@ -19309,10 +20784,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "segmento externo" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "segmento interno" @@ -19320,5 +20795,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Restrição de manobra" @@ -19327,5 +20802,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Editar restrição de manobras" @@ -19333,34 +20808,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Restrição" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "proibida_conversão_esquerda" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "proibida_conversão_direita" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "proibido_em_frente" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "proibido_retornar" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "somente_a_direita" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "somente_a_esuqerda" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "somente_em_frente" @@ -19369,15 +20844,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "do caminho" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "nó de via ou caminho" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "para caminho" @@ -19385,5 +20860,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19392,5 +20867,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19398,5 +20873,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Tipo de rota" @@ -19468,5 +20943,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 @@ -19475,17 +20950,17 @@ msgstr "" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "ônibus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "estrada" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "Ferry" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "Esqui" @@ -19538,5 +21013,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 @@ -19545,13 +21020,13 @@ msgstr "" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "caminhada" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "bonde/VLT" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "desvio" @@ -19565,10 +21040,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "Metrô" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Descrição de símbolo" @@ -19576,31 +21051,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 "Proposto" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternativa" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporário" -#: 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 "Cor (hex)" @@ -19609,30 +21084,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "segmento de rota" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "segmento em frente" #. 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 "Ponto de parada" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "ponto de parada em frente" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "ponto de parada atrás" @@ -20070,11 +21545,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 "depreciado" @@ -20400,41 +21875,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 "estrada" #. color street @@ -22135,5 +23573,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 "" @@ -22732,55 +24170,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22794,5 +24183,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 "turismo" @@ -22864,8 +24253,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 "histórico" @@ -22936,8 +24325,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 "" @@ -22951,5 +24340,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "" @@ -22963,5 +24352,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "aterro" @@ -22983,5 +24372,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22995,5 +24384,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "floresta" @@ -23007,5 +24396,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "fazenda" @@ -23028,5 +24417,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "venda" @@ -23040,5 +24429,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industrial" @@ -23052,5 +24441,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "Área contaminada" @@ -23064,5 +24453,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "campo" @@ -23076,5 +24465,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -23131,7 +24520,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 "exército" @@ -23145,5 +24534,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "Cemitério" @@ -23156,5 +24545,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "cume" @@ -23169,5 +24558,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "geleira" @@ -23181,5 +24570,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulcão" @@ -23234,8 +24623,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 "" @@ -23249,5 +24638,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "arbusto" @@ -23261,19 +24650,7 @@ #. #. -#: 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 "madeira" #. color water @@ -23285,5 +24662,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "lama" @@ -23297,5 +24674,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "praia" @@ -23373,8 +24750,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 "rota" @@ -23422,7 +24799,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 "limite" @@ -23564,10 +24941,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 "lugar" @@ -23615,6 +25001,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 "endereço" @@ -23911,4 +25297,92 @@ msgstr "Terraserver Urban" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Por favor selecione caminhos com ângulos praticamente retos para " +#~ "ortogonalização" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por " +#~ "favor, relate isso como uma falha do programa." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nenhum documento aberto, portanto não há nada a salvar." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Apagar {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Apagar membro de relação {0}{1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Não foi possível abrir o diretório de preferências: {0}" + +#~ msgid "nodes" +#~ msgstr "nós" + +#~ msgid "ways" +#~ msgstr "caminhos" + +#~ msgid "relations" +#~ msgstr "relações" + +#~ msgid "changesets" +#~ msgstr "conjunto de mudanças" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ " Falha ao carregar histórico a partir do servidor. Detalhes:
" +#~ "{0} " + +#~ msgid "Delete Layer" +#~ msgstr "Excluir Camada" + +#~ msgid "Delete all" +#~ msgstr "Apagar tudo" + +#~ msgid "Authors: {0}" +#~ msgstr "Autores: {0}" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: " +#~ "{0}" + +#~ msgid "Public" +#~ msgstr "Público" + +#~ msgid "Continue anyway" +#~ msgstr "Continuar assim mesmo" + +#~ msgid "Edit Information Office" +#~ msgstr "Editar Centro de Informações Turísticas" + +#~ msgid "Map Type" +#~ msgstr "Tipo de Mapa" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "citymap" +#~ msgstr "mapa da cidade" + +#~ msgid "bicyclemap" +#~ msgstr "mapa de ciclovias" + +#~ msgid "Board Type" +#~ msgstr "Tipo de Quadro" + +#~ msgid "board" +#~ msgstr "quadro" + #~ msgid "Aborting..." #~ msgstr "Interrompendo..." @@ -23968,7 +25442,4 @@ #~ msgstr "Criar nova relação" -#~ msgid "Edit relation #{0}" -#~ msgstr "Editar relação #{0}" - #~ msgid "Basic" #~ msgstr "Básico" @@ -24041,6 +25512,59 @@ #~ msgstr "Camada de Dados" +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO! (GNOME)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO! (WebKit GTK)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO! (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO! (GNOME Fix)" + +#~ msgid "Missing primitive" +#~ msgstr "Faltando primitiva" + +#~ msgid "Update failed" +#~ msgstr "Atualização falhou" + +#~ msgid "The following errors occurred during mass download:" +#~ msgstr "Os seguintes erros aconteceram durante a transferência em massa:" + +#~ msgid "Could not find primitive with id {0} in the current dataset" +#~ msgstr "" +#~ "Não foi possível selecionar a primitiva com o id {0} no conjunto de dados " +#~ "atual" + +#~ msgid "unnamed" +#~ msgstr "sem nome" + +#~ msgid "Unknown file extension." +#~ msgstr "Extensão de arquivo desconhecida." + #~ msgid "Could not back up file." #~ msgstr "Não foi possível fazer backup do arquivo." + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde." + +#~ msgid "API initialization failed" +#~ msgstr "Falha na initialização da API" + +#~ msgid "" +#~ "A relation membership was copied to all new ways.\n" +#~ "You should verify this and correct it when necessary." +#~ msgstr "" +#~ "Uma filiação de relação foi copiada para todos os novos caminhos.\n" +#~ "Por favor, verifique e corrija quando necessário." + +#~ msgid "" +#~ "A role based relation membership was copied to all new ways.\n" +#~ "You should verify this and correct it when necessary." +#~ msgstr "" +#~ "Uma filiação de relação com base na atribuição foi copiada para todos os " +#~ "novos caminhos.\n" +#~ "Verifique e corrija quando necessário." #~ msgid "" @@ -24052,60 +25576,4 @@ #~ "a
resultados indesejados quando fizer alinhamentos retangulares." #~ "
Mude sua projeção para evitar esta notificação.
Pretende continuar?" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO! (GNOME)" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO! (WebKit GTK)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO! (WebKit)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO! (GNOME Fix)" - -#~ msgid "Missing primitive" -#~ msgstr "Faltando primitiva" - -#~ msgid "Update failed" -#~ msgstr "Atualização falhou" - -#~ msgid "The following errors occurred during mass download:" -#~ msgstr "Os seguintes erros aconteceram durante a transferência em massa:" - -#~ msgid "Could not find primitive with id {0} in the current dataset" -#~ msgstr "" -#~ "Não foi possível selecionar a primitiva com o id {0} no conjunto de dados " -#~ "atual" - -#~ msgid "Failed to update the selected primitives." -#~ msgstr "Falha ao apagar as primitivas selecionadas." - -#~ msgid "unnamed" -#~ msgstr "sem nome" - -#~ msgid "Unknown file extension." -#~ msgstr "Extensão de arquivo desconhecida." - -#~ msgid "Failed to initialize API. Please try again later." -#~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde." - -#~ msgid "API initialization failed" -#~ msgstr "Falha na initialização da API" - -#~ msgid "" -#~ "A relation membership was copied to all new ways.\n" -#~ "You should verify this and correct it when necessary." -#~ msgstr "" -#~ "Uma filiação de relação foi copiada para todos os novos caminhos.\n" -#~ "Por favor, verifique e corrija quando necessário." - -#~ msgid "" -#~ "A role based relation membership was copied to all new ways.\n" -#~ "You should verify this and correct it when necessary." -#~ msgstr "" -#~ "Uma filiação de relação com base na atribuição foi copiada para todos os " -#~ "novos caminhos.\n" -#~ "Verifique e corrija quando necessário." #~ msgid "Could not write bookmark." Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 17484) +++ /applications/editors/josm/i18n/po/ro.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 13:45+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:09+0000\n" "Last-Translator: Manuel R. Ciosici \n" "Language-Team: Romanian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\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: ROMANIA\n" @@ -23,74 +23,77 @@ "X-Poedit-SourceCharset: utf-8\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 "Se creează interfața grafică" #. 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 "_Ajutor" -#: ../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 "Proiecția {0} nu a putut fi activată. Se folosește Mercator." -#: ../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 @@ -100,156 +103,161 @@ #: ../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 "Eroare" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la " -"server." - -#: ../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] "Exista modificări nesalvate. Renunţ la modificări şi continui?" +msgstr[1] "Exista modificări nesalvate. Renunţ la modificări şi continui?" +msgstr[2] "Exista modificări nesalvate. Renunţ la modificări şi continui?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Modificări nesalvate" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Exista modificări nesalvate. Renunţ la modificări şi continui?" - -#: ../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 "Salvez şi Ies" -#: ../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 "Renunţ şi Ies" -#: ../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 "Renunţă" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Se ignoră URL-ul prost format: \"{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 "Avertisment" -#: ../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 "Se ingoră fişierul URL prost format: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -274,7 +282,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" @@ -312,5 +321,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" @@ -334,6 +343,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 "Module" @@ -350,9 +359,16 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -360,5 +376,5 @@ "încărcate." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -367,5 +383,5 @@ msgstr "" -#: ../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,11 +391,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -388,5 +404,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 "" @@ -403,11 +419,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 @@ -436,5 +452,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 "Latitudine" @@ -443,30 +459,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 "Longitudine" +#: ../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 "Aliniază Nodurile în Cerc" -#: ../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 "Mută nodurile selectate într-un cerc." -#: ../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 @@ -480,6 +496,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 @@ -487,58 +503,57 @@ msgstr "Unealtă: {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 "Vă rog selectaţi cel puţin patru noduri." #. 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 "Aliniază Nodurile în Linie" -#: ../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 "Mută nodurile selectate într-o linie." -#: ../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 "Te rog selectează cel puţin trei noduri." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -547,10 +562,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -559,5 +574,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -566,46 +581,46 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "date" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "strat" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "selecţie" -#: ../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 "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "descărcare" +#: ../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 "Apropie la {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 "Apropie vederea la {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 @@ -615,22 +630,22 @@ msgstr "Vedere: {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 "Combină calea" -#: ../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 "Combină mai multe căi într-una." -#: ../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 "Selectează te rog cel puţin două căi pentru a le combina." @@ -641,4 +656,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Combină oricum" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -646,19 +665,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Combină oricum" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Schimbă direcţiile?" - -#: ../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 "" -"Căile nu pot fi combinate în direcţiile actuale. Doreşti să inversezi unele " -"din ele?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -666,27 +673,34 @@ msgstr "Inversează şi Combină" -#: ../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 "" +"Căile nu pot fi combinate în direcţiile actuale. Doreşti să inversezi unele " +"din ele?" + +#: ../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 "Introdu valori pentru toate conflictele." -#: ../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 "Rezolvă Conflictele" -#: ../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 "Combină {0} căi" -#: ../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 " @@ -694,32 +708,32 @@ msgstr "" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -729,20 +743,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 "Şterge" @@ -752,85 +766,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 "Suprascrie" -#: ../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 "Fişierul există. Îl suprascriu?" #. 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 "Descarc datele 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 "Descarcă hărţi de la serverul 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 "" -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -839,6 +854,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 "" @@ -862,85 +877,90 @@ msgstr "Părăsiţi aplicaţia." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +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 "" -#: ../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 "Exportă datele într-un fişier 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 "Nimic de exportat. Obţineţi mai întâi nişte date." -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "" +#: ../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:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -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: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 "Editare" -#: ../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 "Reîncarcă" -#: ../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 "Se pot edita doar paginile din ajutorul JOSM online" -#: ../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 "" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -992,22 +1012,26 @@ 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:158 +msgid "Merge nodes with different memberships?" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge nodes with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +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 " @@ -1015,77 +1039,73 @@ msgstr "" -#: ../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 "" -#: ../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 "" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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:36 +msgid "up" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -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: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 "" -#: ../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:55 +#, java-format +msgid "Move {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format -msgid "Move {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 -#, java-format msgid "Moves Objects {0}" msgstr "" -#: ../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 "Nu pot muta obiecte în afara lumii." @@ -1093,5 +1113,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 "" @@ -1101,16 +1121,21 @@ 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 "Deschide un fişier." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Deschide un fişier." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, java-format +msgid "Opening file ''{0}'' ..." msgstr "" @@ -1149,21 +1174,17 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -1172,9 +1193,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 "" @@ -1190,13 +1211,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 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1222,37 +1258,32 @@ msgstr "Refă ultima acţiune anulată." -#: ../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 "Redenumire strat" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Şi redenumeşte şi fişierul" -#: ../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 "" +#: ../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 "" @@ -1260,10 +1291,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 "Salvează" #: ../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 "Salvează datele curente." @@ -1274,35 +1306,25 @@ msgstr "" -#: ../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 "Nu este nici un document deschis, nu este nimic de salvat." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Document gol" -#: ../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 "Conflicte" -#: ../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 " @@ -1312,28 +1334,28 @@ "ca şi cum aţi refuzat totul. Continui?" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "" -#: ../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 "Salvează datele curente într-un fişier nou." @@ -1364,33 +1386,33 @@ msgstr "" -#: ../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." @@ -1398,5 +1420,5 @@ msgstr[1] "" -#: ../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 " @@ -1408,9 +1430,9 @@ msgstr[1] "" -#: ../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." @@ -1418,10 +1440,10 @@ msgstr[1] "" -#: ../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 " @@ -1429,5 +1451,5 @@ msgstr "" -#: ../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 " @@ -1435,5 +1457,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 " @@ -1441,7 +1463,29 @@ 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +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 "Salvează datele curente." + +#: ../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 +msgid "No open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" msgstr "" @@ -1460,56 +1504,56 @@ msgstr "" +#: ../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:120 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One tagged node, or" +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, or" +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" +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: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 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../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" @@ -1519,9 +1563,9 @@ msgstr "" -#: ../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" @@ -1529,5 +1573,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" @@ -1571,61 +1615,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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "Despre JOSM..." -#: ../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 "Trimite toate schimbările la serverul 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 "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nimic de transmis. Mai întâi obţineţi nişte date." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Nu sunt schimbări de transmis." -#: ../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 "" -#: ../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 "" @@ -1639,17 +1693,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1660,32 +1714,69 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 +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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1693,31 +1784,82 @@ 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 "Opţiuni hartă" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Obiecte de adăugat:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Obiecte de modificat:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Obiecte de şters:" -#: ../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] "Obiecte de adăugat:" +msgstr[1] "Obiecte de adăugat:" +msgstr[2] "Obiecte de adăugat:" + +#: ../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] "Obiecte de modificat:" +msgstr[1] "Obiecte de modificat:" +msgstr[2] "Obiecte de modificat:" + +#: ../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] "Obiecte de şters:" +msgstr[1] "Obiecte de şters:" +msgstr[2] "Obiecte de şters:" + +#: ../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 "Ultima modificare la {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1741,20 +1883,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 "" -#: ../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 "" @@ -1796,10 +1938,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 "" @@ -1827,31 +1969,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 "Nu au fost importate date." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Date 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 "" -#: ../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 "" @@ -1863,20 +2001,20 @@ msgstr "" -#: ../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 @@ -1885,5 +2023,5 @@ msgstr "" -#: ../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 " @@ -1891,55 +2029,69 @@ msgstr "" -#: ../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 "" +#: ../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 @@ -1947,38 +2099,38 @@ msgstr "selectat" -#: ../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 "Adaugă nod" -#: ../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." @@ -1987,14 +2139,14 @@ msgstr[1] "" -#: ../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 "" @@ -2014,5 +2166,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 "" @@ -2023,5 +2175,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 "" @@ -2037,17 +2189,18 @@ msgstr "" +#: ../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 "Selectaţi" -#: ../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" @@ -2056,30 +2209,34 @@ msgstr[1] "" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." msgstr "" -#: ../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-" @@ -2102,60 +2259,60 @@ msgstr "" +#: ../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 "Caută obiecte" -#: ../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 "Vă rog introduceţi un şir de căutat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "Înlocuieşte selecţia" -#: ../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 "adaugă la selecţie" -#: ../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 "elimină din selecţie" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 +msgid "case sensitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 msgid "regular expression" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2163,109 +2320,109 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" +msgid "modified - all changed objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Căutare" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2326,58 +2483,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Încarcă selecţia" -#: ../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 "Contactez {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Descarc..." -#: ../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 "" -#: ../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 "" -#: ../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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Adaugă nod" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, java-format +msgid "Add relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Schimb {0} obiect" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Ultima modificare la {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Schimbă direcţiile?" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, java-format +msgid "Remove \"{0}\" for node ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, java-format +msgid "Remove \"{0}\" for way ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../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 +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, java-format +msgid "Set {0}={1} for node ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 +#, java-format +msgid "Set {0}={1} for way ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "" + +#: ../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" @@ -2387,10 +2582,10 @@ msgstr[2] "de obiecte" -#: ../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 "" -#: ../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}" @@ -2402,5 +2597,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2409,10 +2604,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2421,5 +2616,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}''" @@ -2443,40 +2638,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../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] "Schimb {0} obiect" +msgstr[1] "Schimb {0} obiecte" +msgstr[2] "Schimb {0} de obiecte" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, 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] "Combină {0} căi" +msgstr[1] "Combină {0} căi" +msgstr[2] "Combină {0} căi" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, 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?" -msgstr "" - -#: ../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 +#: ../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:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "" @@ -2484,6 +2699,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." @@ -2492,5 +2707,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2501,5 +2716,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2534,10 +2749,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2550,18 +2775,38 @@ msgstr "Secvenţă" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Rezolvă {0} conflicte în {1} obiecte" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Rezolvă {0} conflicte în {1} obiecte" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Rezolvă {0} conflicte în {1} obiecte" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Rezolvă {0} conflicte în {1} obiecte" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Rezolvă {0} conflicte în {1} obiecte" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Rezolvă {0} conflicte în {1} obiecte" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2585,13 +2830,13 @@ msgstr "" -#: ../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 "" @@ -2610,62 +2855,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 "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../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 +#, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" + +#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -2679,29 +2981,36 @@ msgstr "" -#: ../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}" @@ -2713,15 +3022,229 @@ msgstr "" -#: ../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 "incomplet" - -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "" + +#: ../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" @@ -2731,22 +3254,7 @@ msgstr[2] "de noduri" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "" - -#: ../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" @@ -2756,12 +3264,7 @@ msgstr[2] "de căi" -#: ../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" @@ -2770,246 +3273,4 @@ msgstr[1] "" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "" -msgstr[1] "" - -#: ../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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "" - -#: ../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" @@ -3022,5 +3283,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "fundal" @@ -3030,5 +3291,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3038,5 +3299,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3047,21 +3308,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3082,8 +3343,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3091,15 +3352,101 @@ #: ../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/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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "" + +#: ../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 "incomplet" + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "necunoscut" + +#: ../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 "" @@ -3109,36 +3456,9 @@ msgstr "" -#: ../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 "necunoscut" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3148,9 +3468,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 "" @@ -3159,9 +3479,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3170,9 +3490,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 "" @@ -3182,9 +3513,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Gazdă necunoscută" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3194,11 +3525,6 @@ msgstr "" -#: ../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 "" @@ -3216,38 +3542,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 "şir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Numele utilizatorului." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Parola 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 "" -#: ../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 "şir;şir;..." -#: ../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 " @@ -3255,5 +3581,5 @@ msgstr "" -#: ../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 " @@ -3261,5 +3587,5 @@ msgstr "" -#: ../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 " @@ -3267,75 +3593,94 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "oricare" -#: ../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 "Dacă este specificat, resetează configuraţia în loc de a o citi." -#: ../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 "Nume utilizator" -#: ../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 "Parolă" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "utilizare" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "opţiuni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Arată acest ajutor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Argument geometrie unix standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Descarcă perimetrul selectat" -#: ../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 "Descarcă locaţia de la adresă (cu 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 "" -#: ../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 "Descarcă perimetrul selectat ca date gps neprelucrate" -#: ../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 "Selectează cu căutarea dată" -#: ../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 "Restabileşte preferinţele implicite" -#: ../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 "exemple" -#: ../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" @@ -3346,47 +3691,47 @@ "că aţi încărcat date înainte de --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 "În loc de --download= puteţi specifica 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." msgstr "" -#: ../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 "Vizualizare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Unelte" -#: ../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 @@ -3398,21 +3743,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 "" @@ -3452,58 +3797,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "scală" -#: ../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:94 +msgid "The name of the object at the mouse pointer." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 -msgid "The name of the object at the mouse pointer." +msgid "The geographic latitude at the mouse pointer." +msgstr "" + +#: ../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:98 -msgid "The geographic latitude at the mouse pointer." +msgid "The (compass) heading of the line segment being drawn." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java: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 "stratul nu este în listă." -#: ../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 "" - -#: ../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 "" @@ -3516,10 +3847,4 @@ 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 "" - #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 msgid "false: the property is explicitly switched off" @@ -3577,7 +3902,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" @@ -3593,5 +3917,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" @@ -3694,5 +4018,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 "" @@ -3703,5 +4027,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" @@ -3715,5 +4039,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 "" @@ -3788,6 +4112,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" @@ -3897,10 +4221,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 "" @@ -3909,19 +4233,19 @@ msgstr "" -#: ../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 "" @@ -3930,5 +4254,5 @@ msgstr "" -#: ../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 "" @@ -3946,9 +4270,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 " @@ -3956,110 +4280,112 @@ 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 "şters" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4068,21 +4394,21 @@ msgstr "" -#: ../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 "" @@ -4121,10 +4447,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 @@ -4133,10 +4460,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 @@ -4150,5 +4478,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}" @@ -4189,4 +4517,137 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "nici unul" + +#: ../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 "Alegeţi o culoare" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 +#, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Nu a fost încă implementat." + +#: ../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 +msgid "Tags from ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "elimină din selecţie" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +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] "" +msgstr[1] "" + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +msgid "Cancel conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Rezolvă Conflictele" + +#: ../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 +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} punct" +msgstr[1] "{0} puncte" +msgstr[2] "{0} de puncte" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4202,10 +4663,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 @@ -4213,5 +4674,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}" @@ -4244,5 +4705,5 @@ #: ../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." @@ -4251,31 +4712,25 @@ "mai sus." -#: ../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 "" @@ -4287,150 +4742,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 "Istoric" -#: ../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 "Afişează istoricul tuturor elementelor selectate." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#, java-format +msgid "Way {0}" +msgstr "" + +#: ../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 "Versiune {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 "" - -#: ../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 "Reîncarcă toate obiectele selectate curent şi împrospătează lista." #. 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 "Straturi" -#: ../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 "Deschide o listă cu toate straturile încărcate." -#: ../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 "Şterge stratul selectat." -#: ../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 "" - -#: ../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 "Arată/Ascunde" -#: ../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 "Comută starea vizibilă a stratului selectat." -#: ../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 "Mută stratul selectat un rând în sus." -#: ../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 "Mută stratul selectat un rând în jos." -#: ../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." @@ -4439,28 +4862,22 @@ msgstr[1] "" -#: ../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 "Schimb valorile?" -#: ../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" @@ -4469,90 +4886,85 @@ msgstr[1] "" -#: ../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 "Vă rog selectaţi o cheie" -#: ../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 "Vă rog selectaţi o valoare" -#: ../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 "" "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile." -#: ../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 "Adaugă" -#: ../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 "Adaugă o nouă pereche cheie/valoare tuturor obiectelor" -#: ../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 "Editează valoarea cheii selectata pentru toate obiectele" -#: ../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 "" -#: ../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 "" -#: ../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 "Şterge cheia selectată din toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "" @@ -4561,34 +4973,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 "" -#: ../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 "" @@ -4621,102 +5033,115 @@ #: ../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 "Selecţie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#, java-format +msgid "Selection: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434 +msgid "Undock the panel" +msgstr "" + +#: ../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." +msgstr "" + +#: ../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: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:66 +msgid "Open a list of people working on the selected objects." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 -#, java-format -msgid "Selection: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160 -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 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 -msgid "Click to minimize/maximize the panel content" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 -msgid "Authors" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 -msgid "Open a list of people working on the selected objects." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +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 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "" - -#: ../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 "" @@ -4725,47 +5150,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 " @@ -4774,14 +5193,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 "" @@ -4791,9 +5210,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 "" @@ -4803,15 +5222,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4819,5 +5238,5 @@ msgstr "" -#: ../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 " @@ -4825,20 +5244,20 @@ msgstr "" -#: ../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 "" @@ -4847,57 +5266,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 " @@ -4906,9 +5325,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 "" @@ -4917,20 +5336,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 @@ -4940,37 +5355,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 "" @@ -4980,30 +5395,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 "" @@ -5017,22 +5432,26 @@ 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 +msgid "Loading parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5065,34 +5484,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Semne de carte" -#: ../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 "Vă rog întâi introduceţi coordonatele dorite." -#: ../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 "Vă rog introduceţi un nume pentru locaţie." -#: ../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 "Selectaţi întâi un semn de carte." @@ -5146,13 +5552,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 "" @@ -5160,18 +5566,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 "" @@ -5210,37 +5615,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: " @@ -5249,5 +5654,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 "" @@ -5274,46 +5679,74 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Descarcă hărţi de la serverul OSM." + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5632,14 +6065,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5815,8 +6262,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" #. @@ -5913,4 +6366,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6024,6 +6480,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 @@ -6031,153 +6487,170 @@ #: 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 "Nume" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Schimbă direcţiile?" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +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 "Ultima modificare la {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6186,32 +6659,287 @@ msgstr "" -#: ../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 "Selecţie" + +#: ../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 "Vă rog selectaţi o valoare" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "" + +#: ../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 +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 "Renunţ şi Ies" + +#: ../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 "Salvez şi Ies" + +#: ../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 "Strat" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +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 "Nume utilizator" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Reîncarcă" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Imagini pentru {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 "" -#: ../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 "Nu există timp pentru punctul {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 "Nu pot citi timpul \"{0}\" din punctul {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 "Nu am găsit imagini cu mărci de timp citibile." -#: ../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 @@ -6219,29 +6947,29 @@ msgstr "Citesc {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 "Imagini geoetichetate" -#: ../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 "Start 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 "Sfârşit 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 "diferentă curentă: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "diferenţă zonă de timp: " -#: ../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" @@ -6251,14 +6979,14 @@ msgstr[2] "de imagini" -#: ../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} în urmă." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Sincronizare ceas" -#: ../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 @@ -6266,82 +6994,82 @@ msgstr "Imagine 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 "Datele din fişierul \"{0}\" nu au putut fi interpretate." -#: ../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 "Nu există timp EXIF în fişierul \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Imagine" -#: ../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 "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" -#: ../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 "" -#: ../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 "Sincronizare timp cu unitatea 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 "Timpul introdus nu a putut fi interpretat." -#: ../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 "punct 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 "Personalizează trasarea liniilor" +#: ../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 "Utilizează opţiunile globale." + #: ../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 "Utilizează opţiunile globale." +msgid "Draw lines between points for this layer." +msgstr "Trasează linii între puncte pentru acest strat." #: ../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 "Trasează linii între puncte pentru acest strat." - -#: ../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 "Nu trasa linii între puncte pentru acest strat." -#: ../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 "Selectaţi opţiunile pentru trasarea liniilor" -#: ../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 "Personalizează culoarea" -#: ../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 "Implicit" -#: ../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" @@ -6401,5 +7129,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}" @@ -6415,10 +7143,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 "Converteşte la strat de date" #: ../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." @@ -6427,11 +7155,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 "" #: ../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 @@ -6471,4 +7199,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Descarc date" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6487,64 +7220,64 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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} constă în:" -#: ../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} şters.)" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -6553,5 +7286,5 @@ msgstr[2] "de urme" -#: ../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" @@ -6560,5 +7293,5 @@ msgstr[2] "de puncte" -#: ../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" @@ -6568,5 +7301,5 @@ msgstr[2] "o urmă cu {0} de puncte" -#: ../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" @@ -6576,5 +7309,5 @@ msgstr[2] "{0} este format din {1} de urme" -#: ../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" @@ -6584,9 +7317,9 @@ msgstr[2] "{0} de puncte" -#: ../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 "" -#: ../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" @@ -6594,5 +7327,5 @@ msgstr[1] "" -#: ../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" @@ -6611,5 +7344,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}." @@ -6617,5 +7350,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 "" @@ -6643,5 +7376,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 " @@ -6649,5 +7382,5 @@ msgstr "" -#: ../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 " @@ -6655,29 +7388,29 @@ msgstr "" -#: ../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:43 +msgid "There was an error while trying to display the URL for this marker" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "There was an error while trying to display the URL for this marker" +msgid "(URL was: " msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 -msgid "(URL was: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +msgid "Advanced Preferences" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 -msgid "Advanced Preferences" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java: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 @@ -6685,26 +7418,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 "" -#: ../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 "Vă rog selectaţi rândul care va fi editat." -#: ../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 @@ -6712,14 +7445,14 @@ msgstr "" -#: ../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 "Vă rog selectaţi rândul care va fi şters." -#: ../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 "" @@ -6842,40 +7575,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 "Culoare" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Alegeţi" -#: ../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 "Alegeţi o culoare pentru {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 "Culori utilizate de diferite obiecte în JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Culori" @@ -6919,5 +7652,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "" @@ -6939,16 +7672,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:" #. @@ -6978,12 +7712,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 "" @@ -7156,5 +7890,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 "" @@ -7162,23 +7896,32 @@ #. 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 "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +msgid "Show localized name in selection lists" +msgstr "" + +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +msgid "Show localized name in selection lists, if available" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Aspect" @@ -7210,54 +7953,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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Configurări afişare" -#: ../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 " @@ -7267,41 +8010,41 @@ "program." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Configurări conexiune" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Opţiuni hartă" -#: ../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 "Opţiuni pentru proiecţia hărţii şi interpretarea datelor." -#: ../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 "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect." -#: ../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 "Metodă de proiecţie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "" @@ -7334,12 +8077,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 "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Adresă server principal" #. 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 @@ -7366,61 +8101,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Şterge sursele selectate din listă." -#: ../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 "" @@ -7586,36 +8320,58 @@ 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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +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 "Şterge stratul selectat." + +#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 @@ -7623,15 +8379,15 @@ msgstr "" -#: ../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 "Eroare la prelucrarea {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 "" -#: ../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 @@ -7642,22 +8398,22 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../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 "Modificare proprietăţi" -#: ../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}''" @@ -7696,11 +8452,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 "Nu am putut citi \"{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 " @@ -7708,38 +8464,38 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "descrierea pistei gps" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Adaugă informaţii despre autor" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nume real" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Drepturi de autor (adresă)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Predefinit" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "An drepturi de autor" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Cuvinte cheie" @@ -7749,9 +8505,9 @@ msgstr "Opţiuni exportare" -#: ../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 "" @@ -7760,10 +8516,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258 msgid "Choose a predefined license" msgstr "Alegeţi o licenţă predefinită" -#: ../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 @@ -7773,12 +8529,12 @@ msgstr "" -#: ../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 "" -#: ../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" @@ -7799,6 +8555,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 @@ -7808,20 +8564,40 @@ msgstr "Descarc datele 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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 +#, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7829,34 +8605,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "" -#: ../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:43 +msgid "Malformed sentences: " +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 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 "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "" @@ -7867,9 +8643,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7878,15 +8654,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7894,33 +8670,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." +msgstr "Pregătesc datele..." + +#: ../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 +#, java-format +msgid "Reusing existing changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +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 "Ultima modificare la {0}" + +#: ../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 "Contactez {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, 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}." @@ -7948,29 +8781,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Parolă sau nume utilizator incorecte." -#: ../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 "Atenţie: Parola este transferată necriptată." -#: ../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 "Salvează nume utilizator şi parolă (necriptate)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Introduceţi parola" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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." @@ -7979,13 +8816,17 @@ "nici o parolă." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Adresă server principal" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "Parola 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." @@ -7994,20 +8835,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8016,5 +8857,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8207,35 +9048,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - -#: ../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:104 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "" + +#: ../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 "Nimic de transmis. Mai întâi obţineţi nişte date." + +#: ../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 "" @@ -8245,5 +9097,5 @@ msgstr "" -#: ../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." @@ -8252,23 +9104,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8279,30 +9131,30 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Modulul nu a fost găsit: {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 "" -#: ../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 " @@ -8310,21 +9162,21 @@ msgstr "" +#: ../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:176 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 -msgid "Disable plugin" +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 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 " @@ -8332,5 +9184,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8338,19 +9190,19 @@ msgstr "" -#: ../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 "" -#: ../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." msgstr "" -#: ../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 " @@ -8358,13 +9210,13 @@ msgstr "" -#: ../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" @@ -8375,5 +9227,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" @@ -8382,18 +9234,18 @@ msgstr[1] "" -#: ../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 "" -#: ../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 "" @@ -8403,9 +9255,9 @@ msgstr "" -#: ../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 "" @@ -8415,35 +9267,35 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 msgid "Plugin bundled with JOSM" msgstr "" -#: ../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 "" -#: ../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 "Nu fă nimic" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Raportează eroarea" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8453,18 +9305,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Excepţie netratată" +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#, java-format +msgid "Please report a ticket at {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 -#, java-format -msgid "Please report a ticket at {0}" +msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 -msgid "Include your steps to get to the error (as detailed as possible)!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8472,19 +9324,19 @@ msgstr "" -#: ../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 "" -#: ../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 "" @@ -8493,5 +9345,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8500,5 +9352,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8508,5 +9360,5 @@ msgstr "" -#: ../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" @@ -8514,5 +9366,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8521,17 +9373,17 @@ msgstr "" -#: ../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 "" @@ -8540,4 +9392,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8562,9 +9449,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 @@ -8572,27 +9477,39 @@ 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" +#: ../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 +msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" +msgstr "" + +#: ../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}" @@ -8600,47 +9517,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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -8749,19 +9666,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 "" -#: ../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 "" -#: ../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 "Eroare la prelucrarea {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." @@ -8770,34 +9687,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -8805,69 +9722,69 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8876,9 +9793,9 @@ msgstr "" -#: ../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 "" @@ -8887,65 +9804,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -8953,13 +9870,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8980,5 +9897,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -8991,12 +9908,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 "Selecţie" - -#: ../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 "" @@ -9027,6 +9943,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9035,21 +9951,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" @@ -9058,37 +9974,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 "" -#: ../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." @@ -9100,18 +10027,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9119,5 +10046,5 @@ msgstr "" -#: ../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). " @@ -9125,39 +10052,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9213,7 +10140,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contactez serverul OSM..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 @@ -9251,20 +10177,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" @@ -9272,9 +10198,14 @@ 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 +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" @@ -9282,27 +10213,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 msgid "East" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 msgid "North" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -msgid "Set Lambert coordinate" -msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 +#, fuzzy +msgid "Set " +msgstr "Selectaţi" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9364,6 +10307,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)" @@ -9385,6 +10328,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 "" @@ -9920,6 +10863,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 "" @@ -9932,8 +10875,4 @@ msgid "land" msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "nici unul" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10216,9 +11155,9 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10227,5 +11166,5 @@ msgstr "" -#: ../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 "" @@ -10784,5 +11723,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 "" @@ -10801,29 +11740,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 "" @@ -10837,23 +11776,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 "" -#: ../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" @@ -10862,38 +11793,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10901,81 +11832,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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?" @@ -10985,25 +11916,25 @@ msgstr[1] "" -#: ../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 "" @@ -11090,53 +12021,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" @@ -11161,19 +12092,46 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +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 +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 +msgid "Duplicated ways" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 +msgid "Delete duplicate ways" msgstr "" @@ -11257,23 +12215,23 @@ msgstr "" +#: ../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:150 -msgid "Properties checker :" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../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 "" -#: ../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 "" @@ -11282,7 +12240,7 @@ msgstr "" +#: ../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 "" @@ -11290,80 +12248,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11371,82 +12329,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java: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:711 +msgid "Check property values." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 -msgid "Check property values." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 +msgid "Use default data file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 -msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 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:743 +msgid "Use default spellcheck file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 -msgid "Use default spellcheck file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../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 "" -#: ../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}''" @@ -11591,7 +12549,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 "" @@ -11605,5 +12563,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 "" @@ -11739,5 +12697,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11782,14 +12740,14 @@ msgstr "" -#: ../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}" @@ -11800,26 +12758,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 "" -#: ../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 "" -#: ../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 " @@ -11827,37 +12785,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -11870,104 +12846,140 @@ 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 +msgid "(deactivated)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 +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" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +msgid "WMS URL (Default)" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../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 +msgid "Copy Selected Default(s)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Selectează te rog cel puţin două căi pentru a le combina." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12328,62 +13340,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 "Strat" #. item "Streets/Motorway" combo "Layer" @@ -12398,5 +13355,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 "" @@ -12411,5 +13368,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" @@ -12419,10 +13375,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 "" @@ -12466,9 +13422,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 "" @@ -12516,13 +13472,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 "" @@ -12564,13 +13520,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 "" @@ -12610,12 +13566,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 "" @@ -12655,12 +13611,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 "" @@ -12816,17 +13772,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 "" @@ -12853,4 +13809,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" @@ -12869,11 +13826,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 "" @@ -12883,4 +13841,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" @@ -12895,9 +13854,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 "" @@ -12905,9 +13865,70 @@ #: 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 +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 "Email" + +#. 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 +msgid "paving_stones" msgstr "" @@ -12916,11 +13937,92 @@ #: 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 "selecţie" + +#: 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 "incomplet" + +#: 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 +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 "" @@ -13002,20 +14104,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 "" @@ -13028,8 +14130,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 "" @@ -13064,32 +14166,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 "" @@ -13102,40 +14219,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 "" @@ -13148,19 +14265,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 "" @@ -13183,65 +14300,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13256,10 +14378,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 "" @@ -13275,17 +14397,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" @@ -13297,30 +14418,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 "" @@ -13328,25 +14449,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 "" @@ -13357,5 +14478,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 "" @@ -13371,5 +14492,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" #. @@ -13377,9 +14498,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 "" @@ -13399,10 +14520,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 "" @@ -13424,10 +14545,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 "" @@ -13449,10 +14570,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 "" @@ -13474,5 +14595,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" @@ -13487,9 +14608,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 "" @@ -13503,9 +14624,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 "" @@ -13535,10 +14656,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 "" @@ -13568,6 +14689,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 "" @@ -13578,10 +14699,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 "" @@ -13589,19 +14710,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 "" @@ -13617,5 +14738,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "" @@ -13624,5 +14745,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13630,5 +14751,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13636,5 +14757,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "" @@ -13644,11 +14765,16 @@ #. 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 +msgid "Pedestrians" msgstr "" #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "" @@ -13657,11 +14783,16 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" +msgstr "" + +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +msgid "Bikes" msgstr "" #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "" @@ -13670,5 +14801,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "" @@ -13676,5 +14807,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "" @@ -13684,5 +14815,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 "" @@ -13691,5 +14822,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13698,39 +14829,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 "" @@ -13739,5 +14842,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13745,5 +14848,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13752,5 +14855,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13758,5 +14861,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13765,5 +14868,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13771,5 +14874,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13778,5 +14881,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13784,5 +14887,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13791,5 +14894,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13798,5 +14901,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "" @@ -13805,19 +14908,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 "" @@ -13827,5 +14933,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 "" @@ -13833,5 +14939,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -13841,5 +14947,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 "" @@ -13847,5 +14953,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -13855,5 +14961,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 "" @@ -13861,5 +14967,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -13869,5 +14975,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 "" @@ -13875,5 +14981,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -13883,5 +14989,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 "" @@ -13889,5 +14995,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -13897,5 +15003,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 "" @@ -13903,10 +15009,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 "" @@ -13914,15 +15020,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 "" @@ -13930,5 +15036,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -13942,4 +15048,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" #. @@ -13959,18 +15067,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 "" @@ -13979,5 +15089,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "" @@ -13987,5 +15097,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -13994,27 +15104,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 "" @@ -14022,6 +15132,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 "" @@ -14030,11 +15140,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 "" @@ -14042,30 +15152,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 "" @@ -14073,5 +15183,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14080,14 +15190,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14098,14 +15208,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 "" @@ -14115,20 +15225,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 "" @@ -14136,5 +15246,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "" @@ -14142,5 +15252,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14148,5 +15258,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14155,10 +15265,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 "" @@ -14166,5 +15276,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "" @@ -14172,5 +15282,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "" @@ -14178,11 +15288,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 "" @@ -14190,5 +15300,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "" @@ -14196,5 +15306,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "" @@ -14202,5 +15312,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14245,16 +15355,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 "" @@ -14263,5 +15373,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14269,5 +15379,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14275,10 +15385,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 "" @@ -14286,15 +15396,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 "" @@ -14302,5 +15412,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "" @@ -14308,10 +15418,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 "" @@ -14321,5 +15431,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14328,5 +15438,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14335,5 +15445,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "" @@ -14341,5 +15451,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "" @@ -14348,5 +15458,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14358,15 +15468,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 "" @@ -14374,50 +15484,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 "" @@ -14425,25 +15535,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 "" @@ -14454,10 +15564,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 "" @@ -14465,5 +15575,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "" @@ -14471,5 +15581,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14477,10 +15587,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 "" @@ -14488,10 +15598,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 "" @@ -14499,10 +15609,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 "" @@ -14512,5 +15622,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 "" @@ -14518,15 +15628,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 "" @@ -14534,15 +15644,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 "" @@ -14550,15 +15660,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 "" @@ -14566,5 +15676,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "" @@ -14573,10 +15683,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 "" @@ -14587,14 +15697,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 "" @@ -14608,35 +15718,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 "" @@ -14644,20 +15754,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 "" @@ -14665,10 +15775,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 "" @@ -14676,5 +15786,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "" @@ -14682,5 +15792,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "" @@ -14688,5 +15798,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14695,5 +15805,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14701,10 +15811,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 "" @@ -14712,5 +15822,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "" @@ -14718,5 +15828,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "" @@ -14724,15 +15834,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 "" @@ -14741,5 +15851,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14747,20 +15857,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 "" @@ -14769,15 +15879,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 "" @@ -14785,10 +15895,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 "" @@ -14796,10 +15906,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 "" @@ -14809,5 +15919,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 "" @@ -14815,10 +15925,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 "" @@ -14826,5 +15936,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "" @@ -14854,8 +15964,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 "" @@ -14869,35 +15979,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 "" @@ -14905,45 +16015,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 "" @@ -14951,5 +16061,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -14958,14 +16068,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 "" @@ -14974,5 +16084,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -14981,5 +16091,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -14989,5 +16099,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -14995,5 +16105,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "" @@ -15002,10 +16112,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 "" @@ -15013,10 +16123,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 "" @@ -15024,10 +16134,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 "" @@ -15035,10 +16145,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 "" @@ -15046,5 +16156,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15052,5 +16162,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 "" @@ -15061,10 +16171,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 "" @@ -15074,9 +16184,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" @@ -15096,47 +16435,73 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" +#. 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:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 +#: build/trans_presets.java:1393 +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 +msgid "Capacity (overall)" +msgstr "" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 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 +#: build/trans_presets.java:1398 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "" @@ -15144,5 +16509,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "" @@ -15150,15 +16515,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "" @@ -15166,5 +16531,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "" @@ -15173,10 +16538,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "" @@ -15184,5 +16549,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "" @@ -15190,6 +16555,11 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" +msgstr "" + +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" msgstr "" @@ -15197,5 +16567,5 @@ #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "" @@ -15204,15 +16574,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 "" @@ -15220,5 +16590,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15226,5 +16596,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15232,5 +16602,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -15239,5 +16609,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -15245,5 +16615,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -15252,5 +16622,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -15262,5 +16632,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 "" @@ -15268,10 +16638,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 "" @@ -15280,10 +16650,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 "" @@ -15292,5 +16662,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "" @@ -15299,5 +16669,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "" @@ -15305,5 +16675,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -15313,5 +16683,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 "" @@ -15320,8 +16690,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 "" @@ -15329,10 +16697,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 "" @@ -15340,5 +16708,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "" @@ -15346,5 +16714,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "" @@ -15352,5 +16720,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "" @@ -15358,15 +16726,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 "" @@ -15375,5 +16743,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "" @@ -15385,5 +16753,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -15392,15 +16760,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 "" @@ -15408,20 +16776,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 "" @@ -15429,10 +16797,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 "" @@ -15440,30 +16808,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 "" @@ -15471,10 +16839,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 "" @@ -15485,5 +16853,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -15491,5 +16859,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "" @@ -15497,5 +16865,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 "" @@ -15503,61 +16871,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 "" @@ -15565,9 +16933,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 "" @@ -15575,10 +16943,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 "" @@ -15586,20 +16953,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 "" @@ -15607,10 +16972,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 "" @@ -15618,33 +16982,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 "" @@ -15652,10 +17007,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 "" @@ -15664,10 +17018,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 "" @@ -15675,25 +17028,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 "" @@ -15701,5 +17053,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "" @@ -15707,86 +17059,198 @@ #. 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" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "la" + +#. 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 +msgid "scheme" +msgstr "" + +#: build/trans_presets.java:1721 +msgid "Shown Area" +msgstr "" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +msgid "site" +msgstr "" + +#: build/trans_presets.java:1721 +msgid "city" +msgstr "" + +#: build/trans_presets.java:1721 +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 +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 +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 +msgid "Board Content" +msgstr "" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "nod" + +#: 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 +msgid "plants" +msgstr "" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +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 "descrierea pistei gps" + +#: build/trans_presets.java:1765 +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 +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 "" @@ -15794,25 +17258,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 "" @@ -15821,20 +17285,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 "" @@ -15843,10 +17306,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 "" @@ -15854,5 +17316,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "" @@ -15860,15 +17322,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 "" @@ -15876,45 +17338,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 "" @@ -15922,15 +17384,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 "" @@ -15938,15 +17400,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 "" @@ -15960,6 +17422,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 "" @@ -16351,30 +17813,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 "" @@ -16384,227 +17846,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 "" @@ -16643,248 +18103,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "" @@ -16892,178 +18344,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 "" @@ -17071,5 +18523,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "" @@ -17077,10 +18529,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 "" @@ -17088,10 +18540,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 "" @@ -17099,10 +18551,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 "" @@ -17111,10 +18563,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 "" @@ -17123,10 +18575,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 "" @@ -17136,10 +18588,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 "" @@ -17148,10 +18600,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 "" @@ -17159,5 +18611,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "" @@ -17165,15 +18617,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 "" @@ -17181,10 +18633,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 "" @@ -17192,10 +18644,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 "" @@ -17203,5 +18655,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "" @@ -17209,5 +18661,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "" @@ -17216,10 +18668,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 "" @@ -17228,10 +18680,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 "" @@ -17239,10 +18690,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 "" @@ -17251,10 +18702,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 "" @@ -17264,5 +18715,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 "" @@ -17271,6 +18722,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 "" @@ -17279,66 +18730,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 "" @@ -17347,81 +18798,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 "" @@ -17430,5 +18881,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "" @@ -17436,5 +18887,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "" @@ -17442,20 +18893,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 "" @@ -17463,5 +18914,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "" @@ -17470,5 +18921,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "" @@ -17476,71 +18927,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 "" @@ -17548,10 +18995,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 "" @@ -17559,10 +19006,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 "" @@ -17570,10 +19017,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 "" @@ -17583,10 +19030,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 "" @@ -17594,10 +19041,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 "" @@ -17605,10 +19052,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 "" @@ -17616,10 +19063,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 "" @@ -17627,5 +19074,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "" @@ -17633,5 +19080,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "" @@ -17641,39 +19088,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 "" @@ -17682,10 +19129,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 "" @@ -17694,5 +19141,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "" @@ -17700,10 +19147,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 "" @@ -17714,5 +19161,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 "" @@ -17720,5 +19167,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "" @@ -17727,46 +19174,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 "" @@ -17775,5 +19216,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "" @@ -17781,5 +19222,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 "" @@ -17787,5 +19228,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 "" @@ -17793,5 +19234,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 "" @@ -17799,5 +19240,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 "" @@ -17805,15 +19246,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 "" @@ -17822,5 +19263,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "" @@ -17828,80 +19269,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 "" @@ -17910,10 +19347,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 "" @@ -17922,10 +19359,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 "" @@ -17933,25 +19370,33 @@ #. 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 +msgid "Chemist" +msgstr "" + +#. item +#: build/trans_presets.java:2473 +msgid "Edit Chemist" +msgstr "" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "" @@ -17959,10 +19404,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 "" @@ -17970,10 +19414,27 @@ #. 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 +msgid "Edit Book Store" +msgstr "" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +msgid "Edit Travel Agency" +msgstr "" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "" @@ -17981,5 +19442,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "" @@ -17987,88 +19448,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 "" -#: 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 "" @@ -18076,10 +19537,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 "" @@ -18087,10 +19547,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 "" @@ -18098,20 +19557,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 "" @@ -18119,60 +19576,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 "" @@ -18180,10 +19631,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 "" @@ -18191,10 +19641,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 "" @@ -18202,60 +19651,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 "" @@ -18263,10 +19706,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 "" @@ -18274,10 +19716,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 "" @@ -18285,35 +19726,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 "" @@ -18321,16 +19759,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 "" @@ -18338,5 +19774,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "" @@ -18344,15 +19780,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 "" @@ -18360,20 +19796,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 "" @@ -18381,5 +19815,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "" @@ -18387,10 +19821,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 "" @@ -18398,10 +19831,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 "" @@ -18410,5 +19843,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18417,20 +19850,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 "" @@ -18438,5 +19871,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 "" @@ -18445,55 +19878,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 "" @@ -18501,15 +19934,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "" #. 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 "" @@ -18517,10 +19950,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 "" @@ -18528,25 +19961,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 "" @@ -18554,5 +19987,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18560,10 +19993,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 "" @@ -18571,11 +20004,23 @@ #. 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 "selectat" + +#. item +#. +#: build/trans_presets.java:2825 +msgid "Edit Islet" +msgstr "" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "" @@ -18583,10 +20028,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 "" @@ -18594,10 +20039,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 "" @@ -18605,10 +20050,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 "" @@ -18616,70 +20061,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 "" @@ -18688,15 +20133,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 "" @@ -18705,5 +20150,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "" @@ -18711,17 +20156,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 "" @@ -18730,14 +20175,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 "" @@ -18745,25 +20190,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 "" @@ -18771,10 +20216,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 "" @@ -18782,5 +20227,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "" @@ -18788,5 +20233,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -18795,45 +20240,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 "" @@ -18841,25 +20286,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 "" @@ -18867,10 +20312,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 "" @@ -18878,20 +20323,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 "" @@ -18899,5 +20344,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -18905,15 +20350,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 "" @@ -18921,9 +20366,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 "" @@ -18931,39 +20376,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 "" @@ -18971,15 +20416,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 "" @@ -18987,55 +20432,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 "" @@ -19045,5 +20490,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 "" @@ -19052,10 +20497,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 "" @@ -19063,5 +20508,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19070,5 +20515,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19076,34 +20521,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 "" @@ -19112,15 +20557,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 "" @@ -19128,5 +20573,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19135,5 +20580,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19141,5 +20586,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19211,5 +20656,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 @@ -19218,17 +20663,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 "" @@ -19281,5 +20726,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 @@ -19288,13 +20733,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 "" @@ -19308,10 +20753,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 "" @@ -19319,31 +20764,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 "" @@ -19352,30 +20797,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 "" @@ -19813,11 +21258,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 "" @@ -20142,41 +21587,4 @@ #: build/trans_style.java:542 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 "" @@ -21878,5 +23286,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 "" @@ -22475,55 +23883,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22537,5 +23896,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 "" @@ -22607,8 +23966,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 "" @@ -22679,8 +24038,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 "" @@ -22694,5 +24053,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "" @@ -22706,5 +24065,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22726,5 +24085,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22738,5 +24097,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "" @@ -22750,5 +24109,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22771,5 +24130,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22783,5 +24142,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "" @@ -22795,5 +24154,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22807,5 +24166,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22819,5 +24178,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -22874,7 +24233,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 "" @@ -22888,5 +24247,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "" @@ -22899,5 +24258,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "" @@ -22912,5 +24271,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "" @@ -22924,5 +24283,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "" @@ -22977,8 +24336,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 "" @@ -22992,5 +24351,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23004,18 +24363,6 @@ #. #. -#: 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 "" @@ -23028,5 +24375,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "" @@ -23040,5 +24387,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "" @@ -23116,8 +24463,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 "" @@ -23165,7 +24512,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 "" @@ -23307,10 +24654,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 "" @@ -23358,6 +24714,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 "" @@ -23654,4 +25010,12 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la " +#~ "server." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nu este nici un document deschis, nu este nimic de salvat." + #~ msgid "Aborting..." #~ msgstr "Anulez..." @@ -23668,7 +25032,4 @@ #~ msgid "Date" #~ msgstr "Dată" - -#~ msgid "Not implemented yet." -#~ msgstr "Nu a fost încă implementat." #~ msgid "" @@ -23712,7 +25073,4 @@ #~ msgstr "diferit" -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Rezolvă {0} conflicte în {1} obiecte" - #~ msgid "Change" #~ msgstr "Schimbă" @@ -23726,7 +25084,4 @@ #~ msgid "Unknown file extension." #~ msgstr "Extensie fişier necunoscută." - -#~ msgid "Email" -#~ msgstr "Email" #~ msgid "{0} object has conflicts:" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 17484) +++ /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" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 17484) +++ /applications/editors/josm/i18n/po/sk.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 13:41+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-05 04:48+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Vytváram hlavné grafické rozhranie ( GUI )" #. 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 "Pomocník" -#: ../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 "Projekcia {0} nemohla byť aktivovaná. Používam Mercator" -#: ../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 @@ -96,154 +99,161 @@ #: ../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 "Chyba" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny." - -#: ../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] "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" +msgstr[1] "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" +msgstr[2] "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Neuložené zmeny" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" - -#: ../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 "Uložiť a Ukončiť" -#: ../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 "Zrušiť a Ukončiť" -#: ../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 "Zrušiť" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem skomolenú URL: \"{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 "Varovanie" -#: ../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 "Ignorujem poškodený súbor z URL: \"{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 "Nemôžem čítať súbor ''{0}''. Chyba je:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +278,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" @@ -306,5 +317,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" @@ -328,6 +339,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 "Pluginy" @@ -342,8 +353,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 "" "VAROVANIE: neočakávaný formát z API základne URL. Presmerovávanie na stránku " @@ -351,9 +362,19 @@ "''{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 "" +"VAROVANIE: neočakávaný formát z API základne URL. Presmerovávanie na stránku " +"histórie pre OSM pôvodné budú pravdepodobne chybné. API základňa URL je: " +"''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -364,5 +385,5 @@ "vybrané iba pôvodné" -#: ../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 "Prosím vyberte cieľovú vrstvu." @@ -372,11 +393,11 @@ msgstr "Výber cieľovej vrstvy" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "Zlúčiť" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -387,5 +408,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Žiadne cieľové vrstvy" @@ -402,11 +423,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 @@ -435,5 +456,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 "Zemepisná šírka" @@ -442,30 +463,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 "Zemepisná dĺžka" +#: ../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 "Zarovnať body do kruhu" -#: ../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 "Presunúť označené body do kruhu" -#: ../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 @@ -479,6 +500,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 @@ -486,58 +507,57 @@ msgstr "Nástroj: {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 "Vyberte minimálne 4 body" #. 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 "Informácia" #. 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 "Zarovnať body na priamku" -#: ../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 "Presunúť označené body na priamku" -#: ../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 "Vyberte prosím aspoň 3 body." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -548,10 +568,10 @@ "{0}, maximálne je {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 Capabilities Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -562,5 +582,5 @@ "pôvodných {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -571,46 +591,46 @@ "dĺžku {2}. Dĺžka hodnôt je {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Predpoklad Porušenia" -#: ../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} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "údaje" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "výber" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "stiahnuté" +#: ../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 "Priblížiť na {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 "Priblížiť pohľad na {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 @@ -620,22 +640,22 @@ msgstr "Zobrazenie: {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 "Nie je zvolené nič, čo by se mohlo priblížiť." -#: ../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 "Nie je žiadny konflikt, čo by sa mohol priblížiť" +#: ../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 "Spojiť cesty" -#: ../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 "Spojiť niekoľko ciet do jednej." -#: ../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 "Prosím, vyberte aspoň dve cesty pre spojenie." @@ -646,4 +666,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Aj tak spojiť" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -652,19 +676,7 @@ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Aj tak spojiť" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Zmeniť smer?" - -#: ../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 "" -"Cesty nemôžu byť spojené, pretože nemajú jednotný smer. Chcete otočiť smer " -"ciest?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -672,27 +684,34 @@ msgstr "Otočiť a Spojiť" -#: ../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 "" +"Cesty nemôžu byť spojené, pretože nemajú jednotný smer. Chcete otočiť smer " +"ciest?" + +#: ../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 "Zadajte hodnoty pre všetky konflikty" -#: ../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 "Riešenie konfliktov" -#: ../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 "Spojiť {0} ciest" -#: ../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 "Všetky cesty boli prázdne" -#: ../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 " @@ -700,32 +719,32 @@ msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)" +#: ../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 "Kopírovať" -#: ../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 "Vybrať označené objekty pre vloženie." -#: ../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 "Prosím zvoľ niečo pre kopírovanie" +#: ../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 "Vytvoriť kružnicu" -#: ../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 "Vytvoriť kružnicu z troch vybratých bodov." -#: ../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 "Tieto body niesú v kruhu. Prerušujem." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -737,20 +756,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 "Odstrániť" @@ -760,85 +779,86 @@ msgstr "Zmazať zvolené objekty." -#: ../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 "Prepísať" -#: ../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 "Súbor už existuje. Prepísať?" #. 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 "Rozložiť body rovnomerne" -#: ../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 "Rozložiť zvolené body v rovnakej vzdialenosti od seba pozdĺž trasy." +#: ../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 "Stiahnuť z 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 "Stiahnutie mapových údajov z OSM servera." -#: ../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 "Súbor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Stiahnuť" -#: ../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 "Prosím zvolte aspoň jednu úlohu k stiahnutiu" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Sťahovanie odkazov z 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 "Sťahovanie pôvodných odkazov do jedného vybraného pôvodného" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Sťahovanie odkazov..." -#: ../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 "Boli tam {0} konflikty počas importu." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Konflikty počas sťahovania" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -847,6 +867,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 "Duplikovať" @@ -870,80 +890,86 @@ msgstr "Ukončť program." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Všetky obrázky" + +#: ../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 "Exportovať do 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 "Exportovať dáta do GPX súboru." -#: ../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 "Nie je nič na exportovanie. Najskôr stiahnite dáta." -#: ../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 "paramenter ''{0}'' nesmie byť nulový" -#: ../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 "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX súboru" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM Online Nápoveda" -#: ../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 "Otvoriť v prehliadači" -#: ../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 "Upraviť" -#: ../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 "Znovu načítať" -#: ../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 "Nápovedu môžete upravovať iba z online nápovedy JOSM" -#: ../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 "Chyba pri načítaní stránky {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." @@ -951,5 +977,5 @@ "Chýbajúca stránka s pomocou. Vytvorte to v english." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1003,22 +1029,26 @@ msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy" +#: ../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 "Zlúčiť body" -#: ../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 "Zlúčiť body do najstaršieho bodu" -#: ../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 "Zvoľte minimálne dva body pre zlúčenie" -#: ../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 "Zlúčiť body s rôznymi členmi ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Aj tak zlúčiť" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1028,78 +1058,74 @@ "chcete zlúčiť ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Aj tak zlúčiť" - -#: ../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 "" "Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná." -#: ../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 "Zlúčiť {0} body" +#: ../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 "Zlúčiť výber" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy" +#: ../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 "Zrkadlo" -#: ../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 "Zrkadlovo vybrané body a cesty." -#: ../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 "Prosím vyberte aspoň jeden bod, alebo cestu." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "hore" -#: ../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 "Presunúť objekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "dole" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "vľavo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "vpravo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Presunúť {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 "Presunutie objektov {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 "Nemôžem presúvať objekty mimo svet." @@ -1107,5 +1133,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 "Nový" @@ -1115,17 +1141,22 @@ msgstr "Vytvoriť novú mapu" -#: ../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 "Otvoriť..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Otvoriť súbor." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Nemôžem čítať súbor ''{0}''. Chyba je:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Otvoriť súbor." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Neznáma funkcia ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1163,22 +1194,17 @@ msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Povolené iba dva body" -#: ../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 "Výber sa musí skladať iba z ciest" -#: ../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 "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti." - -#: ../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 " @@ -1190,9 +1216,9 @@ "chcete odstrániť toto upozornenie.
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Vybratý iba jeden bod" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Pravouhlosť" @@ -1208,13 +1234,28 @@ msgstr "Vložiť zo schránky" -#: ../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 "Vložiť vlastnosti" -#: ../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 "Použiť značky objektov v schránke na všetky zvolené objekty." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Nahrávam {0}" +msgstr[1] "Nahrávam {0}" +msgstr[2] "Nahrávam {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Obnoviť {0} pôvodných" +msgstr[1] "Obnoviť {0} pôvodných" +msgstr[2] "Obnoviť {0} pôvodných" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1240,38 +1281,32 @@ msgstr "Zopakuje poslednú zrušenú akciu." -#: ../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 "Premenovať vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Tiež premenovať súbor" -#: ../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 "" -"Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" - -#: ../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 "Nemôžem premenovať súbor ''{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 "Otočiť smer ciest" -#: ../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 "Otočiť smer všetkých zvolených ciest." -#: ../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 "Zvoľte minimálne jednu cestu." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Otočiť smer ciest" @@ -1279,10 +1314,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 "Uložiť" #: ../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 "Uložiť aktuálne dáta." @@ -1293,36 +1329,25 @@ msgstr "Súbor {0} existuje. Prepísať ho?" -#: ../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 "Žiadny exportér nenájdený! Nič zachránené.." -#: ../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 "" -"Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Prázdny dokument" -#: ../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 "Dokument neobsahuje dáta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Uložiť akokoľvek" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikty" -#: ../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 " @@ -1332,28 +1357,28 @@ "vyriešené, ako by boli všetky odmietnuté. Pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Zamietnuť konflikty a Uložiť" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Uložiť OSM súbor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Uložiť GPX súbor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Uložiť vrstvu" +#: ../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 "Uložiť ako..." -#: ../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 "Uložiť aktuálne údaje do nového súboru." @@ -1388,33 +1413,33 @@ msgstr "Pomoc: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Správa o stave" -#: ../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 "Kopírovať do schránky a zavrieť" -#: ../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 "Zavrieť" +#: ../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 "Rozdeliť cestu" -#: ../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 "Rozdeliť cestu vo zvolenom bode" -#: ../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 "Tento výber nemôže byť použitý k rozdeleniu." -#: ../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." @@ -1423,5 +1448,5 @@ msgstr[2] "Vybraté body nie sú v strede cesty." -#: ../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 " @@ -1440,9 +1465,9 @@ "vyberte tiež cestu." -#: ../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 "Zvolené body nezdieľajú rovnakú cestu." -#: ../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." @@ -1451,10 +1476,10 @@ msgstr[2] "Označená cesta neobsahuje všetky vybraté body." -#: ../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 "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty." -#: ../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 " @@ -1464,5 +1489,5 @@ "cesty.)" -#: ../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 " @@ -1473,5 +1498,5 @@ "html>" -#: ../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 " @@ -1481,8 +1506,34 @@ "toto overiť a opraviť ak je to nutné." -#: ../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 "Rozdeliť cestu {0} do {1} častí" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Zatváranie kontroly..." + +#: ../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 "Zatváranie kontroly..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Otváranie kontroly..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Zatváranie kontroly..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1500,47 +1551,47 @@ msgstr "Zapnúť/Vypnúť globálne nastavenie ''{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 "Rozpojiť cesty" -#: ../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 "Zduplikovať body používané viacerými cestami." -#: ../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 "Tento bod nie je prilepený k ničomu inému." -#: ../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 "Žiaden z týchto bodov nie je prilepený k ničomu inému." -#: ../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 "Žiadna z týchto ciest nie je prilepená k ničomu inému." -#: ../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 "Tento výber sa nedá použiť pre oddelenie bodov" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Jeden označený bod, alebo" -#: ../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 "* Jeden bod používaný viac než jednou cestou, alebo" +#: ../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 "" +"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" + #: ../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 "" -"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" - -#: ../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" @@ -1549,5 +1600,5 @@ "ceste, alebo" -#: ../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." @@ -1556,5 +1607,5 @@ "ceste." -#: ../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" @@ -1567,9 +1618,9 @@ "svoje vlastné kópie a všetky bodybudú vybraté." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nepripojený bod (Unglued Node)" -#: ../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" @@ -1577,5 +1628,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" @@ -1619,61 +1670,71 @@ msgstr "Aktualizácia zvolenej údajovej vrstvy zo servera (re-downloads data)" -#: ../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 "Aktualizujem dáta" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "Nájdená neaktuálna dátová sada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Neviem zistiť pôvodné s id {0} v aktuálnej dátovej sade" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Aktualizácia výberu" -#: ../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 "Aktualizovať práve vybrané pôvodné zo servera" -#: ../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 "Nie sú tam vybrané pôvodné pre aktualizáciu." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Výber je prázdny" -#: ../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 "Uložiť do 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 "Uložiť všetky zmeny na OSM server." -#: ../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 "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Žiadne zmeny pre uloženie." -#: ../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 "Synchronizovať {0} {1} iba" -#: ../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 "Synchronizovať celú dátovú sadu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1694,17 +1755,17 @@ "zrušenie a pokračovanie v editácii.
" -#: ../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 "Zistený konflikt" #. 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 "neočakávaná hodnota. Dostal {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1719,5 +1780,5 @@ "{1} pre zrušenie a pokračovanie v editácii.
" -#: ../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}\"" @@ -1725,27 +1786,65 @@ "Varovanie: chybné záhlavie \"{0}\" nie je zhoda s očakávanou schémou \"{1}\"" -#: ../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 "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{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 "Upload zlyhal.
{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 "Nahrávanie na OSM API neúspešné" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Aktualizácia pôvodných" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Uložiť tieto úpravy?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Nahrať zmeny" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Upraviť novú reláciu vo vrstve \"{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 "Pridať nový bod do existujúcej cesty" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "nahrať všetky zmeny v jednej požiadavke" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1755,31 +1854,83 @@ "požiadavky na zmenené pôvodné" -#: ../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 "Doplniť krátky komentár k nahrávaným zmenám" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Nastavenie mapy" + +#: ../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 "changeset" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Pridané objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Upravené objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Odstránené objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Doplniť krátky komentár k nahrávaným zmenám" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Uložiť tieto úpravy?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Nahrať zmeny" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Nahrávanie" +#: ../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] "Pridané objekty:" +msgstr[1] "Pridané objekty:" +msgstr[2] "Pridané objekty:" + +#: ../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] "Upravené objekty:" +msgstr[1] "Upravené objekty:" +msgstr[2] "Upravené objekty:" + +#: ../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] "Odstránené objekty:" +msgstr[1] "Odstránené objekty:" +msgstr[2] "Odstránené objekty:" + +#: ../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 "Posledná zmena {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1803,20 +1954,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 "Audio: {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 "Rýchlejšie" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Rýchle prehrávanie" @@ -1858,10 +2009,10 @@ msgstr "Prehrajte predchádzajúcu značku" -#: ../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 "Pomalšie" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Spomalené prehrávanie" @@ -1889,31 +2040,27 @@ msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}" -#: ../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 "Neboli importované žiadne dáta." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "údaje 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 "Stiahnuté {0} z {1} ({2} ostáva(left))" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Aktualizujem dáta" - -#: ../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 "Nastedujúca chyba nastala počas masového sťahovania:{0}" -#: ../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 "Chyby v priebehu sťahovania" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1930,20 +2077,20 @@ "servery.
Click {2}ignorovať.
" -#: ../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 "Vymazané alebo presunuté pôvodné" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Režim mazania" -#: ../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 "Zmazať body alebo cesty" -#: ../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 @@ -1952,5 +2099,5 @@ msgstr "Režim: {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 " @@ -1960,55 +2107,69 @@ "nemaže body. CTRL: zmaže referenčné objekty." -#: ../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 "parameter ''{0}'' nesmie byť nulový" +#: ../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 "Kresliť" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Kresliť body" -#: ../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 "Režim: Kresliť Fokus" -#: ../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 @@ -2016,38 +2177,38 @@ msgstr "zvolené" -#: ../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 "Nemôžem pridať body ležiace mimo svet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Pridať bod" -#: ../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 "Pridať bod do cesty" -#: ../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 "Pripojiť existujúcu cestu do bodu" -#: ../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 "Pridať nový bod do existujúcej cesty" -#: ../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 "Pridať bod do cesty a spojiť" -#: ../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 "Vytvoriť nový bod." -#: ../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 "Zvoliť bod pod kurzorom." -#: ../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." @@ -2057,14 +2218,14 @@ msgstr[2] "Vložiť nový bod do {0} ciest." -#: ../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 "Začiatok novej cesty z posledného bodu." -#: ../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 "Pokračovanie cesty z posledného bodu." -#: ../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 "Koniec kreslenia." @@ -2084,5 +2245,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 "Pustite tlačítko myši pre vybratie objektov v obdĺžniku." @@ -2094,5 +2255,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 "Pustite tlačítko myši k zastaveniu otáčania" @@ -2110,17 +2271,18 @@ "záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode." +#: ../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 "Výber" -#: ../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 "Zvoliť, posunúť a otáčať objekty" -#: ../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" @@ -2130,13 +2292,21 @@ msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Posunúť elementy" -#: ../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 "Posunúť ich(them)" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Krok späť posun" + +#: ../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 "" @@ -2145,13 +2315,9 @@ "Skutočne ich presunúť?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Posunúť ich(them)" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Krok späť posun" - -#: ../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." @@ -2159,5 +2325,5 @@ "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." -#: ../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-" @@ -2184,62 +2350,62 @@ "hore dolu doľava doprava; pohyb so zväčšením možno tiež pravým tlačítkom myši" +#: ../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 "Vyhľadávať..." -#: ../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 "Vyhľadávať objekty" -#: ../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 "Nemôžem vyhľadávať, pretože nie sú načítané dáta." -#: ../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 "Zadajte hladaný reťazec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "nahradiť označené" -#: ../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 "pridať k výberu" -#: ../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 "odobrať z výberu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "veľkosť písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regulárny výraz" +#: ../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' a 'Street' v akomkoľvek kľúči, alebo mene." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' v akomkoľvek kľúči, alebo mene." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' v akomkoľvek kľúči, alebo mene." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' kdekoľvek v mene." -#: ../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 "typ=cesta - kľúč 'typ' s presnou hodnotou 'cesta'." -#: ../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, " @@ -2249,17 +2415,17 @@ "typ=, *=*, *=" -#: ../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 - neobsahuje 'Bak' v mene." -#: ../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: - klúč 'foot' nastavený na akúkoľvek hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Špeciálne ciele:" -#: ../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)" @@ -2268,93 +2434,94 @@ "b>)" -#: ../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:... - všetky objekty nahraté užívateľom" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objekt s pridaným ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objekt s pridaným ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt s pridanými číslami bodov" -#: ../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 - všetky zmenené objekty" -#: ../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 - všetky vybraté objekty" -#: ../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 - všetky nekompletné objekty" -#: ../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 "untagged - všetky neoznačené objekty" -#: ../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" msgstr "dieťa výraz - všetky deti objektov vyhovujúcich výrazu" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Použite | alebo OR pri kombinácii s logickým \"alebo\"" -#: ../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 "Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" -#: ../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 "Použite ( a ) k zoskupeniu výrazov" -#: ../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 "Hľadať" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Začať vyhľadávanie" -#: ../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 "Neboli nájdené záznamy pre \"{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 "Nič nebolo pridané do výberu hľadaním \"{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 "Nič nebolo odstránené z výberu hľadaním \"{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 "Najdených {0} zodpovedajúcich výrazov" -#: ../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" @@ -2423,58 +2590,96 @@ msgstr "Nesprávna hodnota pre id operátor: {0}. Číslo je očakávané." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Nahrať výber" -#: ../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 "Kontakt {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Sťahujem ..." -#: ../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 "Nemôžem čítať z URL:\"{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 "Chyba parsovania v URL:\"{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 "Chyba počas komunikácie so serverom" -#: ../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 "Pridať bod" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Pridať {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "Zmeniť {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/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relácie: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Zmenová sada {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Zmenová sada {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Zmeniť reláciu" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Odstranené \"{0}\" pre {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Odstranené \"{0}\" pre {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 "Odstranené \"{0}\" pre {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Nastavené {0}={1} pre {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 "Nastavené {0}={1} pre {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Nastavené {0}={1} pre {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" @@ -2484,10 +2689,10 @@ msgstr[2] "objektov" -#: ../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 "Odstranené \"{0}\" pre {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}" @@ -2499,5 +2704,5 @@ msgstr "Zmena funkcie relačného člena pre {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2508,10 +2713,10 @@ "konflikt nemôže byť pridaný." -#: ../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 "Dvojitý konflikt" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2522,5 +2727,5 @@ "''{1}''" -#: ../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}''" @@ -2544,44 +2749,64 @@ msgstr "nemôžem vyriešiť nerozhodnutý konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Zmazať {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Zmazať {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] "Zmazať {0} {1}" +msgstr[1] "Zmazať {0} {1}" +msgstr[2] "Zmazať {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] "Režim mazania" +msgstr[1] "Režim mazania" +msgstr[2] "Režim mazania" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Zmazať {0} {1}" +msgstr[1] "Zmazať {0} {1}" +msgstr[2] "Zmazať {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] "Zmazať z relácie (zo vzťahu" +msgstr[1] "Zmazať z relácie (zo vzťahu" +msgstr[2] "Zmazať z relácie (zo vzťahu" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Konfliktné vzťahy (relation)" -#: ../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 "Zmazať z relácie (zo vzťahu" + +#: ../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 "" "Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\" s funkciou {2}.\n" "Zmazať zo vzťahu (relation)?" -#: ../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 "Zmazať z relácie (zo vzťahu" - -#: ../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 "" "Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\".\n" "Zmazať zo vzťahu (relation)?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Rozdeliť segment cesty" @@ -2589,6 +2814,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." @@ -2600,5 +2825,5 @@ "
Naozaj ich chcete zmazať?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Odstrániť potvrdenie" @@ -2609,5 +2834,5 @@ msgstr "Vyriešte konflikty v zmazaných (state) v {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" @@ -2645,10 +2870,20 @@ msgstr "Rozhodnutie konfliktov v member list of relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Odstrániť člena relácie {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" @@ -2662,17 +2897,37 @@ msgstr "Sekvencia" -#: ../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 "Vyriešte {0} konfliktov značiek v {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 "Vyriešte {0} konfliktov značiek v {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Vyriešte {0} konfliktov značiek v {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Obnoviť {0} pôvodných" -#: ../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 "Vyriešte konflikt verzií pre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Vyriešte konflikt verzií pre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Vyriešte konflikt verzií pre {0} {1}" @@ -2699,13 +2954,13 @@ "sú navrhované v takom poradí aby zachovali konzistenciu dát." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Vzťah (relation)" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Stará funkcia" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nová funkcia" @@ -2724,62 +2979,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 "Nová hodnota" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Použiť zvolené zmeny" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Neurobiť zmeny" -#: ../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 "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Vlastnosti " -#: ../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 "Funkcie vo vzťahoch (relations) odkazujú na" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Automatická úprava značiek (tag)" -#: ../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 "Poškodený konfiguračný súbor pri linke {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Nemôžem otvoríť adresár s nastavením: {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 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "failed to set reference. reference id {0} doesn't match history id {1}" + +#: ../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 "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {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 "Predvoľby uložené na {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 "Nemôžem nahrať predvoľby. Dôvod: {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 "Nemôžem nahrať predvoľby zo servera." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2795,29 +3107,36 @@ msgstr "práve zapísaný má konflikt s pôvodným ''{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 "Stupne" -#: ../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 "Stupne minúty sekundy" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "J" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "Z" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "V" -#: ../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 +3148,232 @@ msgstr "parameter {0} > 0 požadovaný. Dostal {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 "neúplný" - -#: ../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 "Chyba: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Varovanie: {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 "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{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 "Nie sú tam pôvodné s verziou {0} v tejto histórii" + +#: ../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 "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "nenájdená predchádzajúca verzia. História je prázdna." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "nenájdená staršia verzia. História je prázdna." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade" + +#: ../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 "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade" + +#: ../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 "parameter ''{0}'' > 0 očakávaný, dostáva ''{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 "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s 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 "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Cesta označená ako plocha nie je uzavretá." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená." + +#. 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 "Prázdny člen vo vzťahu (relation)." + +#: ../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 "Vymazaný člen ''{0}'' vo vzťahu (relation)." + +#: ../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 "Cesta ''{0}'' s menej, než dvoma bodmi." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Najdená viac než jedna \"from\" cesta." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Najdené viac cieľových \"to\" ciest." + +#: ../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 "Viac ako jedna \"via\" najdená." + +#: ../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 "Neznáma funkcia ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Neznámy typ člena pre ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Nenajdená cesta \"from\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Nenajdená cesta \"to\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Nie je \"via\" bod alebo cesta najdená." + +#: ../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 "Cesta \"from\" nezačína, ani nekončí v bode \"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 "Táto \"to\" cesta nezačína a nekončí na \"via\" bode." + +#: ../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 "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste." + +#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Štýl pre obmedzenie {0} nenajdený." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Vnútorná(inner) cesta ''{0}'' je vonku." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "neoznačený" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "text" + +#. 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 "" +"Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v " +"nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto nezrovnalosťou. " +"Zostávajú moje pôvodné. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "neaktívny" + #: ../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 +3383,7 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Chyba: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Varovanie: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "body" - -#: ../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 +3393,7 @@ msgstr[2] "ciest" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "cesty" - -#: ../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 +3403,134 @@ msgstr[2] "vzťahov (relations)" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relácie" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "changeset" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "changesets" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{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 "neoznačená cesta" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +msgid "incomplete way" +msgstr "nekompletná cesta" + +#: ../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 "pozadie" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 +msgid "highlight" +msgstr "označiť (highlight)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 +msgid "WGS84 Geographic" +msgstr "WGS84 Zemepisné" + +#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 +msgid "Gauss-Laborde Réunion 1947" +msgstr "Gauss-Laborde Réunion 1947" + +#: ../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 "" +"Dôležité : súradnice v dátach sú ďaleko od\n" +"hranice Lambertovej zóny.\n" +"Nenahrávajte žiadne dáta po zobrazení tejto hlášky!\n" +"Urobte spätný krok (undo), uložte vašu prácu\n" +"a začnite v novej vrstve a v novej zóne." + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +msgid "Lambert Zone (France)" +msgstr "Lambertova zóna (Francie)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 +msgid "Lambert Zone (Estonia)" +msgstr "Lambertova zóna (Estónsko)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 +msgid "Mercator" +msgstr "Mercatorova projekcia" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +msgid "Swiss Grid (Switzerland)" +msgstr "Swiss Grid (Švajčiarsko)" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 +#, java-format +msgid "UTM Zone {0}" +msgstr "UTM Zone {0}" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 +msgid "UTM20N Guadeloupe Fort-Marigot 1949" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 +msgid "UTM20N Guadeloupe Ste-Anne 1948" +msgstr "UTM20N Guadeloupe Ste-Anne 1948" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 +msgid "UTM20N Martinique Fort Desaix 1952" +msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Nemôžem čítať záložky.
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 +#, java-format +msgid "Could not write bookmark.
{0}" +msgstr "Nemôžem zapísať záložku.
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 +msgid "Do not show again" +msgstr "Nezobrazovať v budúcnosti" + +#: ../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 "neúplný" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "komunikácie" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "železnica" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vodný tok" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "využitie oblasti (landuse)" + +#: ../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} bod" +msgstr[1] "{0} body" +msgstr[2] "{0} bodov" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 #, java-format msgid "{0} member" @@ -2917,313 +3540,9 @@ msgstr[2] "{0} členov" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "komunikácie" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "železnica" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vodný tok" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "využitie oblasti (landuse)" - -#: ../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} bod" -msgstr[1] "{0} body" -msgstr[2] "{0} bodov" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii" - -#: ../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 "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "nenájdená predchádzajúca verzia. História je prázdna." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "nenájdená staršia verzia. História je prázdna." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade" - -#: ../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 "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade" - -#: ../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 "parameter ''{0}'' > 0 očakávaný, dostáva ''{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 "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s 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 "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Cesta označená ako plocha nie je uzavretá." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená." - -#. 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 "Prázdny člen vo vzťahu (relation)." - -#: ../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 "Vymazaný člen ''{0}'' vo vzťahu (relation)." - -#: ../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 "Cesta ''{0}'' s menej, než dvoma bodmi." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Najdená viac než jedna \"from\" cesta." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Najdené viac cieľových \"to\" ciest." - -#: ../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 "Viac ako jedna \"via\" najdená." - -#: ../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 "Neznáma funkcia ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Neznámy typ člena pre ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Nenajdená cesta \"from\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Nenajdená cesta \"to\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Nie je \"via\" bod alebo cesta najdená." - -#: ../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 "Cesta \"from\" nezačína, ani nekončí v bode \"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 "Táto \"to\" cesta nezačína a nekončí na \"via\" bode." - -#: ../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 "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste." - -#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Štýl pre obmedzenie {0} nenajdený." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Vnútorná(inner) cesta ''{0}'' je vonku." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "neoznačený" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "text" - -#. 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 "" -"Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v " -"nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto nezrovnalosťou. " -"Zostávajú moje pôvodné. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "neaktívny" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -msgid "untagged way" -msgstr "neoznačená cesta" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 -msgid "incomplete way" -msgstr "nekompletná cesta" - -#: ../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 "pozadie" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -msgid "highlight" -msgstr "označiť (highlight)" - -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographic" -msgstr "WGS84 Zemepisné" - -#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 -msgid "Gauss-Laborde Réunion 1947" -msgstr "Gauss-Laborde Réunion 1947" - -#: ../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 "" -"Dôležité : súradnice v dátach sú ďaleko od\n" -"hranice Lambertovej zóny.\n" -"Nenahrávajte žiadne dáta po zobrazení tejto hlášky!\n" -"Urobte spätný krok (undo), uložte vašu prácu\n" -"a začnite v novej vrstve a v novej zóne." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 -msgid "Lambert Zone (France)" -msgstr "Lambertova zóna (Francie)" - -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 -msgid "Lambert Zone (Estonia)" -msgstr "Lambertova zóna (Estónsko)" - -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 -msgid "Mercator" -msgstr "Mercatorova projekcia" - -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 -msgid "Swiss Grid (Switzerland)" -msgstr "Swiss Grid (Švajčiarsko)" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 -#, java-format -msgid "UTM Zone {0}" -msgstr "UTM Zone {0}" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "UTM20N Guadeloupe Fort-Marigot 1949" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "UTM20N Guadeloupe Ste-Anne 1948" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "UTM20N Martinique Fort Desaix 1952" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, java-format -msgid "Could not read bookmarks.
{0}" -msgstr "Nemôžem čítať záložky.
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 -#, java-format -msgid "Could not write bookmark.
{0}" -msgstr "Nemôžem zapísať záložku.
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -msgid "Do not show again" -msgstr "Nezobrazovať v budúcnosti" - -#: ../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 "" "Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" @@ -3231,5 +3550,43 @@ "pripojenia na 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 "neznámy" + +#: ../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 "" @@ -3242,36 +3599,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Predpokladaný priestupok" -#: ../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 "neznámy" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3285,9 +3615,9 @@ "applet z ''{1}''." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "Bezpečnostná výnimka" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3298,9 +3628,9 @@ "
Prosím, skontrolujte vaše internetové pripojenie." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "Sieťová výnimka" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3308,10 +3638,23 @@ "problem with transferring data.
Details(untranslated): {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168 +"Nepodarilo sa nahrať dáta na alebo stiahnuť z
\"{0}\"
pre " +"problém pri prenose dát.
Detaily (nepreložené): {1}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 msgid "IO Exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190 +msgstr "IO Výnimka" + +#: ../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 "" @@ -3324,9 +3667,9 @@ "URL vo vašich nastaveniach a vaše internetové pripojenie." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Neznámy hostiteľ" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3339,14 +3682,7 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Pôvodné je už zmazané" - -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 -#, java-format -msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" -msgstr "" -"Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. Výnimka: " -"{0}" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3363,38 +3699,38 @@ msgstr "Sťahujem \"Správu dňa\"" -#: ../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 "Nahrať nastavenie" -#: ../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 "Nahrať súčasné nastavenie na server" -#: ../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 "reťazec" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Meno užívateľa." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM heslo." -#: ../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 "Zmeniť veľkosť appletu (formát: ŠÍRKAxVÝŠKA)" -#: ../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 "reťazec;reťazec;..." -#: ../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 " @@ -3404,5 +3740,5 @@ "šírka=y&dĺžka=x&zoom=z alebo ešte názov súboru" -#: ../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 " @@ -3412,5 +3748,5 @@ "obsahujúcom šírka=y&dĺžka=x&zoom=z alebo ešte ešte názov súboru" -#: ../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 " @@ -3420,76 +3756,95 @@ "google, alebo URL vracajúci sa z osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "akýkoľvek" -#: ../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 "" "Ak je špecifikovaný(určený), reset konfigurácie namiesto jej načítania." -#: ../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 "Meno používateľa" -#: ../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 "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "použitie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Zobrazí túto nápovedu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Štandardný unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Stiahnuť ohraničujúcí box" -#: ../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 "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=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 "Otvoriť súbor (as raw gps, if .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 "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta" -#: ../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 "Výber s určeným hľadaním" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Spustiť v maximalizovanom režime" -#: ../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 "Nastaviť východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Nastaviť jazyk." -#: ../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 "príklady" -#: ../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" @@ -3500,47 +3855,47 @@ "nejaké dáta predtým--výber" -#: ../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 "Namiesto --download= môžete zadať 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 "Aktivujem aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Načítavam skoršie pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Nastavujem východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Načítavam pluginy" -#: ../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." msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Súbor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Nástroje" -#: ../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 "Predvoľby" -#: ../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 @@ -3552,21 +3907,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 "Drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Prepnúť drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Prepínač pohladu na celej obrazovke" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Zvuk" @@ -3606,63 +3961,45 @@ msgstr "Oddialiť" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "mierka" -#: ../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 "Zemepisná dĺžka na mieste kurzoru myši." -#: ../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 "Meno objektu na mieste kurzoru myši." -#: ../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 "Zemepisná šírka na mieste kurzoru myši." -#: ../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 "Uhol medzi predchádzajúcim a súčasným úsekom cesty." -#: ../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 "Bude zobrazená smerová šípka v segmente línie." -#: ../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 "Dĺžka nového nakresleného segmentu trasy bude zobrazená." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(žiadny objekt)" -#: ../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 "vrstva nie je v zozname" -#: ../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 "Vrstva ''{0}'' musí byť v zozname vrstiev" - -#: ../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 "" -"Varovanie: neúspešná voľba umiestniť panel dialógu vždy na vrchu. Výnimky " -"boli: {0}" - -#: ../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 "" -"Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. " -"Výnimky boli: {0}" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 @@ -3673,10 +4010,4 @@ msgid "File not found" msgstr "Súbor nebol nájdený" - -#: ../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 @@ -3735,7 +4066,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" @@ -3751,5 +4081,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" @@ -3856,5 +4186,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 "Moja verzia" @@ -3865,5 +4195,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" @@ -3879,5 +4209,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 "Ich verzia" @@ -3963,6 +4293,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" @@ -4081,10 +4411,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 "neočakávaný index stĺpca. Got {0}" -#: ../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 "" @@ -4094,19 +4424,19 @@ "Nastala chyba počas komunikácie so serverom
Detaily: {0}" -#: ../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 "Spojenie so serverom zlyhalo" -#: ../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 "Áno, obnoviť ich tiež" -#: ../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 "Nie, zrušiť operáciu" -#: ../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 "" @@ -4117,5 +4447,5 @@ "servery.

Chcete obnoviť tieto body tiež?" -#: ../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 "Obnoviť pridané body?" @@ -4135,9 +4465,9 @@ msgstr "Obnoviť pôvodné závislé odkazy?" -#: ../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 "Vlastnosti v mojej dátovej sade, i.e. lokálna dátová sada" -#: ../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 " @@ -4147,95 +4477,97 @@ "elementoch, keď rozhodnutie o spojenie bude aplikované." -#: ../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 "Vlastnosti v ich dátovej sade, i.e. serverova dátova sada" -#: ../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 "Súradnice:" -#: ../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 "Vymazaný stav:" -#: ../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 "Viditeľný Stav:" -#: ../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 "(žiadny)" -#: ../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 "zmazané" -#: ../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 "nevymazaný" -#: ../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 "viditeľné (na servery)" -#: ../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 "neviditeľné (na servery)" -#: ../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 "Zostáva klon lokálnej verzie" -#: ../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 "Fyzicky vymazať z lokálnej verzie" -#: ../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 "Ponechaj moje súradnice" -#: ../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 "Ponechaj ich súradnice" -#: ../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 "Nerozhodnuté konflikty medzi rôznymi súradnicami" -#: ../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 "Udržať môj vymazaný stav" -#: ../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 "Udržať ich vymazaný stav" -#: ../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 "Nevyriešené konflikty medzi vymazávaným stavom" -#: ../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 "Zostáva môj viditeľný stav" -#: ../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 "Áno, vynulovať 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 "Nie, zrušiť" -#: ../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 "" "Ponechať vašu lokálnu verziu, JOSM
má nastaviť id z {0} {1} na 0." @@ -4243,17 +4575,17 @@ "html>" -#: ../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 "Nastaviť id na 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 "Ponechať svoj viditeľný stav" -#: ../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 "Áno, očistiť to" -#: ../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 "" @@ -4264,21 +4596,21 @@ "
Súhlasíte?" -#: ../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 "Odstrániť z dátovej sady" -#: ../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 "Nerozhodnutý konflikt medzi viditeľnými stavom" #: ../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 "Úloha" #: ../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 "Pôvodný" @@ -4318,10 +4650,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 @@ -4330,10 +4663,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 @@ -4347,5 +4681,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}" @@ -4386,4 +4720,144 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Ich(their) dátová sada neobsahuje značku s kľúčom {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 "žiadny" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "všetky" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Zvoľte farbu" + +#: ../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 "parameter ''{0}'' je nesprávny typ mena, dostava ''{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 "parameter ''{0}'' nesmie byť nulový" + +#: ../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 "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {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 "nevymazaný" + +#: ../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 "Zatiaľ nie je implementované." + +#: ../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 "z cesty" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Zmazať z relácie (zo vzťahu" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikt v dátach" + +#: ../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} ciest" +msgstr[1] "{0} cesta" +msgstr[2] "{0} cesty" + +#: ../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} relácia" +msgstr[1] "{0} relácie" +msgstr[2] "{0} relácií" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Rozhodnutie konfliktov" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Rozhodnutie konfliktov" + +#: ../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 "Použiť" + +#: ../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 "Vložiť" + +#: ../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} štart" +msgstr[1] "{0} štart" +msgstr[2] "{0} štart" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4399,10 +4873,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 @@ -4410,5 +4884,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}" @@ -4441,5 +4915,5 @@ #: ../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." @@ -4448,33 +4922,25 @@ "vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 -msgid "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" -msgstr "" -"Varovanie: nemôžem setAlwaysOnTop(true) pre ConflictResolution Dialog. " -"Výnimka: {0}" - -#: ../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 "Zrušiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../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 "Použiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Použiť rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "Zavrieť akúkoľvek cestu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Pokračovanie rozhodnutia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4491,150 +4957,118 @@ "{1} to return to resolving conflicts." -#: ../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 "Konflikt nie je úplne vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Rozhodnutie konfliktov" -#: ../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 "Rozhodnúť konflikt pre ''{0}''" -#: ../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 "História" -#: ../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 "Zobraziť históriu všetkých zobrazených objektov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "Chybný priebeh nahrávania zo servera. Detaily:
{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 "index je mimo hranice Dostať {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 "Bod {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 "Vrstva: {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 "Relácie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Položka priebehu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Nahrať priebeh" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Nahrávam priebeh pre {0}s 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 "Znovu nahrať vybrané objekty a obnoviť zoznam." #. 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 "Ukázať" -#: ../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 "Zobraziť priebeh z vybraných pôvodných" -#: ../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 "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first" -#: ../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 "Vrstvy" -#: ../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 "Otvoriť zoznam všetkých nahratých vrstiev." -#: ../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 "Odstrániť vybranú vrstvu." -#: ../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 "Nachádzajú sa neuložené zmeny vo vrstve''{0}''. Vymazať vrstvu určite?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -msgid "Delete Layer" -msgstr "Vymazať vrstvu" - -#: ../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 "Naozaj chcete vymazať vrstvu ''{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 "Potvrdenie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "Áno" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "Nie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Zmazať všetko" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "Vymazávaná vrstva {0} z {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Zobraziť/Skryť" -#: ../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 "Prepnúť viditeľnosť zvolenej vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "Aktivovať" -#: ../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 "Aktivovať vybratú vrstvu" -#: ../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 "Spojiť túto vrstvu do ďalšej vrstvy" -#: ../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 "Presunúť zvolenú vrstvu o riadok hore." -#: ../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 "Presunúť zvolenú vrstvu o riadok dole." -#: ../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 "Informácie o vrstve" -#: ../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." @@ -4644,30 +5078,22 @@ msgstr[2] "Toto zmení až {0} objekty." -#: ../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 "Prázdna hodnota zmaže klúče" -#: ../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 "Zmeniť hodnoty ?" -#: ../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 "" -"Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na vrchu. " -"Výnimka bola: {0}" - -#: ../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" @@ -4677,91 +5103,84 @@ msgstr[2] "Zmeniť vlastnosti až {0} objektov." -#: ../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 "Vyberte prosím kľúč" -#: ../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 "Vyberte prosím hodnotu" -#: ../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 "" -"Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka " -"bola: {0}" - -#: ../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 "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti." -#: ../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 "Vlastnosti/Členstvo(memberships)" -#: ../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 "Vlastnosti pre zvolené objekty" #. 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 "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Pridať vlastnosti" -#: ../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 "Pridať" -#: ../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 "Pridať nový kľúč/hodnota pár k všetkým objektom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Upraviť vlastnosti" -#: ../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 "Zmeniť hodnotu zvoleného klúča pre všetky objekty" -#: ../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 "Vlastnosti: {0} / Memberships: {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 "Vlastnosti / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Zmeniť reláciu" -#: ../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 "Naozaj zmazať výber z relacie {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 "Zmaže zvolený klúč vo všetkých objektoch" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Zmazať vlastnosti" @@ -4770,34 +5189,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 "Relácie" -#: ../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 "Otvoríť zoznam všetkých relácií" -#: ../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 "Relácie: {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 "Otvoriť editor pre zvolenú reláciu" -#: ../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 "Zmazať vybraté relácie" -#: ../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 "Vytvoriť novú reláciu" -#: ../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 "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne" @@ -4830,25 +5249,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 "Výber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} ciest" -msgstr[1] "{0} cesta" -msgstr[2] "{0} cesty" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relácia" -msgstr[1] "{0} relácie" -msgstr[2] "{0} relácií" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4856,16 +5259,9 @@ msgstr "Výber: {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 "Uvoľniť panel" -#: ../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 "" -"Varovanie: neúspešné umiestnenie dialógového okna prepínač vždy na vrchu. " -"Výnimka bola: {0}" - -#: ../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." @@ -4874,64 +5270,101 @@ "lište." -#: ../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 "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu" -#: ../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 "Autori (spracovatelia)" -#: ../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 "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte" -#: ../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] "Autor" +msgstr[1] "Autor" +msgstr[2] "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +#, fuzzy +msgid "Select primitives submitted by this user" +msgstr "Výber pôvodných pre vybraté členy relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Ukázať" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Viac informácii o tejto vlastnosti" + +#: ../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 "" +"VAROVANIE: uvedený prehliadač okien poprvýkrát {0} of {1} {0} of {1} " +"vybrané iba pôvodné" + +#: ../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 "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Autori(spracovatelia): {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 "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" -#: ../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 "Nahrať všetky deti relácií (rekurzívne)" -#: ../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 "Nahrať Všetky Deti" -#: ../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 "Nahrať vybraté relácie" -#: ../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 "Nahrať vybraté deti" -#: ../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 "Stiahnuť členov relácie" -#: ../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 "Konflikt v dátach" -#: ../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 "" @@ -4941,49 +5374,41 @@ "relácia dieťa
{0}
je na servery zmazaná.Nemôže byť načítaná." -#: ../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 "Relácia je zmazaná" -#: ../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 "Nahrávam reláciu {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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 "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" -#: ../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 "Značky a Členy" -#: ../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 "Nadradené vzťahy" -#: ../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 "Relácia dieťa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 -#, java-format -msgid "" -"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" -msgstr "" -"Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka bola: " -"{0}" - #. --- 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 "Funkcia:" -#: ../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 " @@ -4995,14 +5420,14 @@ "pokračovať s kruhovou závislosťou?" -#: ../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 "Odstraňte ich, vyčistite reláciu" -#: ../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 "Ignorujte ich, nechajte reláciu tak ako je" -#: ../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 "" @@ -5015,9 +5440,9 @@ "" -#: ../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 "Viacnásobné členy odkazujú na rovnaké obecné" -#: ../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 "" @@ -5029,5 +5454,5 @@ "odkazy a je preto znechutený.
Vynechanie relácie ''{0}''." -#: ../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" @@ -5035,5 +5460,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom" -#: ../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" @@ -5041,5 +5466,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom" -#: ../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 " @@ -5049,5 +5474,5 @@ "členom" -#: ../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 " @@ -5057,20 +5482,20 @@ "členom" -#: ../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 "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" #. 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 "Editor Relácií: Odstrániť Vybrané" -#: ../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 "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere" -#: ../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 "" @@ -5080,57 +5505,57 @@ "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere" -#: ../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 "Výber pôvodných pre vybraté členy relácie" -#: ../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 "Triedenie členov relácie" #. 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 "Editor Relácií: Triedenie" -#: ../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 "Pridať všetky zvolené objekty medzi členy" #. 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 "Editor Relácií: Posun Hore" -#: ../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 "Presunúť zvolenú vrstvu o riadok dolu." #. 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 "Editor Relácií: Posun Dole" -#: ../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 "Odstrániť práve vybraté členy z tejto relácie" #. 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 "Editor Relácií: Odstrániť" -#: ../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 "Vymazať práve vydanú reláciu" -#: ../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 "Áno, vyriešiť konflikt a zavrieť" -#: ../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 "Nie, pokračovať v editácii" -#: ../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 " @@ -5142,9 +5567,9 @@ "html>" -#: ../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 "Konflikt v dátach" -#: ../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 "" @@ -5155,20 +5580,16 @@ "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../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 "Použiť súčasnú aktuálizáciu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "Použiť" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Použiť aktualizácie a zavrieť dialógové okno" -#: ../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 @@ -5178,37 +5599,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 "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" -#: ../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 "Pridať prázdnu značku" -#: ../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 "Vymazať aktuálne vybrané značky" -#: ../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 "Stiahnuť všetky nekompletné cesty a uzly v relácii" -#: ../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 "Stiahnuť členov" -#: ../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 "Editor Relácií: Sťahovanie Členov" -#: ../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 "Nastavenie funkcie pre vybrané členy" -#: ../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 "Použiť Funkciu" -#: ../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 "" @@ -5221,30 +5642,30 @@ "" -#: ../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 "Áno, Použiť to" -#: ../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 "Nie, použite to" -#: ../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 "Potvrdiť prázdnu funkciu" -#: ../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 "Zväčšiť na" -#: ../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 "Zväčšiť na pôvodné prvé vybraté členy odkazujúce na" -#: ../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 "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna" -#: ../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 "Zväčšovanie je vypnuté pretože nie je vybratý člen" @@ -5258,22 +5679,27 @@ msgstr "Spojený" -#: ../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 "Sťahovanie týkajúcich sa relácií" -#: ../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 "dieťa.id >0 očakávané. Got {1}" -#: ../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 "zahrňujúci priame deti rodičovských(nadriadených) relácií" -#: ../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 "Načítať rodičovské(nadriadené) relácie" -#: ../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 "Načítať rodičovské(nadriadené) relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "Načítať aktuálne vybranú reláciu" @@ -5307,35 +5733,21 @@ "Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: " -#: ../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] "Odstrániť staré kľúče z {0} objektov" -msgstr[1] "Odstrániť staré kľúče z {0} objektu" -msgstr[2] "Odstrániť staré kľúče z {0} objektov" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Záložky" -#: ../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 "Prosím najskôr zadajte požadované koordináty." -#: ../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 "Prosím zadajte meno pre umiestnenie." -#: ../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 "Názov miesta" -#: ../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 "Najskôr zvoľte záložku" @@ -5392,13 +5804,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 "Chyba null pointera, možno sú neprítomné značky" -#: ../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 "Prosím zadajte hľadaný reťazec" -#: ../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 "Nemôžem čítať miestny výsledok vyhľadávania zo servera" @@ -5406,18 +5818,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 "Zapíšte názov miesta pre vyhľadávanie:" -#. 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 "Miesta" #. 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 "meno" @@ -5456,37 +5867,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 "typ" -#: ../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 "blízko" -#: ../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 "zväčšenie" -#: ../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: " @@ -5498,5 +5909,5 @@ "klávesy. Vybrať: Click." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Slippy map" @@ -5523,50 +5934,76 @@ msgstr "Čísla dlaždíc" -#: ../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 "Priebeh (History) pre {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 "" -"Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka " -"bola: {0}" - -#: ../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 "Priebeh (History) pre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Priebeh (History) pre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Zavrieť dialógové okno" -#: ../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 "Zobraziť priebeh z vybraných pôvodných" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" "priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných." -#: ../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 "failed to set reference. reference id {0} doesn't match history id {1}" -#: ../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 "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu" -#: ../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 "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných." -#: ../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 "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Bod {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Nahrať priebeh" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "dieťa.id >0 očakávané. Got {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Nahrávam priebeh pre {0}s id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Nahrávam priebeh pre {0}s id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Nahrávam priebeh pre {0}s id {1}" #. item "Streets/Motorway" text "Reference" @@ -5884,14 +6321,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6067,8 +6518,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" #. @@ -6165,4 +6622,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6276,6 +6736,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 @@ -6283,156 +6743,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 "Názov" -#: ../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 "" "Verzia {0} vytvoraná na {1} podľa " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Zmenová sada {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Viac informácii o tejto vlastnosti" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Zmenová sada {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6440,32 +6918,291 @@ msgstr "Verzia {0} vytvorená na {1} podľa {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Verzia" -#: ../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 "Názov ulice" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Áno" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Nie" + +#: ../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 "Vyberte prosím hodnotu" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Vrstva ''{0}'' musí byť v zozname vrstiev" + +#: ../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 "Oprava konfliktu (rozporu) značiek" + +#: ../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 +#, fuzzy +msgid "Unsafed data non-writable files" +msgstr "Použite východzie značky ignorovaného súboru." + +#: ../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 "Zrušiť a Ukončiť" + +#: ../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 "Uložiť a Ukončiť" + +#: ../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 "Vrstva" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Pri nahrávaní" + +#: ../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 "Súbor" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Nahrávanie" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Obrázky pre {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 "Čítať 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 "Žiadny čas pre bod {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 "Nedá sa prečítať čas \"{0}\" z bodu {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 "Nenájdené žiadne obrázky s časovými značkami." -#: ../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 @@ -6473,29 +7210,29 @@ msgstr "Čítam {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 "Obrázky s GPS súradnicami" -#: ../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 "Štart 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 "Koniec 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 "súčastná odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "rozdiel časových pásiem: " -#: ../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" @@ -6505,14 +7242,14 @@ msgstr[2] "obrázkov" -#: ../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} vo vnútry stopy (track)." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synchronizovať hodiny" -#: ../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 @@ -6520,82 +7257,82 @@ msgstr "JPEG obrázky (*.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 "Dáta v súbore \"{0}\" nemohli byť parsované." -#: ../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 "V súbore \"{0}\" nie je časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Obrázok" -#: ../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 "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" -#: ../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 "Časová zóna GPS zariadenia (rozdiel od fotografie)" -#: ../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 "Synchronizovať čas s GPS zariadením" -#: ../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 "Zadaný čas nemôže byť rozparsovaný" -#: ../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 poloha bodu" -#: ../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 "Prispôsobiť kresliacu trasu" +#: ../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 "Použíť globálne nastavenie." + #: ../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 "Použíť globálne nastavenie." +msgid "Draw lines between points for this layer." +msgstr "Kresliť spojnice medzi bodmi v tejto vrstve" #: ../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 "Kresliť spojnice medzi bodmi v tejto vrstve" - -#: ../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 "Nekresliť spojnice mezi bodmi v tejto vrstve" -#: ../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 "Výber nastavenia kreslenej čiary" -#: ../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 "Prispôsobiť farbu" -#: ../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 "Predvolené" -#: ../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" @@ -6658,5 +7395,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}" @@ -6672,10 +7409,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 "Konvertovať do dátovej vrstvy" #: ../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." @@ -6686,11 +7423,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 @@ -6732,4 +7469,9 @@ "
Chcete pokračovať?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Sťahujem dáta" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6752,64 +7494,64 @@ "ich času boli vynechané." -#: ../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 "Údajová vrstva {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 "mimo ukladanej oblasti" -#: ../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 "verzia {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 "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 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} se skladá z:" -#: ../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} zmazané.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "neuršený (unset)" -#: ../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 "Verzia 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 "Previesť do GPX vrstvy" -#: ../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" @@ -6818,5 +7560,5 @@ msgstr[2] "stopy" -#: ../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" @@ -6825,5 +7567,5 @@ msgstr[2] "bodov" -#: ../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" @@ -6833,5 +7575,5 @@ msgstr[2] "stopy s {0} bodmi" -#: ../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" @@ -6841,5 +7583,5 @@ msgstr[2] "{0} skladá sa z {1} stôp" -#: ../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" @@ -6849,9 +7591,9 @@ msgstr[2] "{0} bodov" -#: ../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 značka" -#: ../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" @@ -6860,5 +7602,5 @@ msgstr[2] "značiek" -#: ../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" @@ -6880,5 +7622,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}." @@ -6886,5 +7628,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 "Nie je možné synchronizovať v už prehrávanej vrstve" @@ -6915,5 +7657,5 @@ msgstr "Prepínač zobrazovania značiek textu a ikon." -#: ../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 " @@ -6923,5 +7665,5 @@ "priradená zvuková stopa, ktorá sa má prehrávať (po prvej značke)." -#: ../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 " @@ -6931,29 +7673,29 @@ "až na track point, ktorý chcete zosynchronizovať." -#: ../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 "Nie je možné vytvoriť novú zvukovú značku" -#: ../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 "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky" -#: ../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 "(URL bolo: " -#: ../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 "Chyba zobrazovania 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 "Pokročilé voľby" -#: ../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 "Ručné nastavenie. Používajte opatrne!" -#: ../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 @@ -6961,26 +7703,26 @@ msgstr "Hľadať: " -#: ../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 "Súčasná hodnota je východzia" -#: ../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 "Východzia hodnota je''{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 "Východzia hodnota nie je známa (ešte nebola definovaná)" -#: ../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 "Prosím vyberte riadok na úpravu." -#: ../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 @@ -6988,14 +7730,14 @@ msgstr "Nová hodnota pre {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 "Prosím vyberte riadok na odstránenie." -#: ../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 "Zadajte novú dvojicu klúč/hodnota" @@ -7015,5 +7757,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 msgid "Create non-audio markers when reading GPX." -msgstr "Vytvoriť bez zvukové značky pri čítaní GPX." +msgstr "Vytvoriť bez zvukovej značky pri čítaní GPX." #. various methods of making markers on import audio @@ -7131,40 +7873,40 @@ msgstr "Kalibrácia zvukového nahrávania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farba" -#: ../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 "Farebný štýl {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 "Vrstva: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Vybrať" -#: ../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 "Zvoľte farbu pre {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 "Zadať východzie (prednastavené)" -#: ../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 "Zadať všetko východzie (prednastavené)" -#: ../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 "Farby použité rôznymi objektami v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Farby" @@ -7208,5 +7950,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Vozidlo" @@ -7228,16 +7970,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 "Bicykel" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7267,12 +8010,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 "Pešo" @@ -7333,5 +8076,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105 msgid "Maximum length for local files (meters)" -msgstr "Maximálna dĺžka pre lokálne subary (v metroch)" +msgstr "Maximálna dĺžka pre lokálne súbory (v metroch)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110 @@ -7458,5 +8201,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 "Zobrazovať pri štarte úvodnú obrazovku" @@ -7464,23 +8207,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 "Ukázať ID objektu v zozname výberu" #: ../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 "Ukázať ID objektu v zozname výberu" + +#: ../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 "Kresliť rubber-band pomocnú čiaru" -#: ../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 "Pracovný režim (Potlach štýl)" -#: ../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 "Ukázať ID objektu v zozname výberu" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Nevyžaduje sa zapnutie režimu (potlach štýl práce)" -#: ../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 "Vzhľad a chovanie" @@ -7512,54 +8266,54 @@ msgstr "Použitý štýl" -#: ../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 "Nastavenie dostupných pluginov." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Stiahnuť zoznam" -#: ../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 "Aktualizovať" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Konfigurovať zariadenie..." -#: ../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 "Pridať JOSM Plugin popis URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" msgstr "Zadať URL" -#: ../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 "Vyber prosím nejakú položku." -#: ../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 "Upraviť JOSM Plugin popis URL." -#: ../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 "JOSM Plugin description URL" -#: ../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 "Konfigurovať umiestnenie pluginov" #. 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 "Nastavenie zobrazenia" -#: ../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 " @@ -7567,41 +8321,41 @@ msgstr "Rôzne nastavenia ovplyvňujúce vzhľad celého programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Nastavenie pripojenia" -#: ../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 "Nastavenie pripojenia pre OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Nastavenie mapy" -#: ../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 "Nastavenie projekcie mapy a interpretácie dát." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Nastavenia zvuku" -#: ../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 "Nastavenia pre zvukový prehrávač a zvukové značky." -#: ../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 "Niektoré nastavenia sa prejavia až po reštartovaní 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 "Zobrazovať súradnice ako" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Metóda projekcie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Projekcia mapy" @@ -7634,12 +8388,4 @@ msgid "Proxy server password" msgstr "Heslo pre proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Základná URL pre OSM server (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Základná Serverová URL" #. 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 @@ -7666,61 +8412,60 @@ msgstr "Skratka" -#: ../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 "Short Description: {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 "Autor: {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 "Internetová stránka: {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 "Verzia: {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 "Icon paths" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Kopírovať východzie" -#: ../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 "Vyberte riadok na kopírovanie." -#: ../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 "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov." -#: ../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 "Pridať nový XML zdroj do zoznamu." -#: ../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 "Zmazať vybratý zdroj zo zoznamu." -#: ../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 "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)" @@ -7908,36 +8653,60 @@ msgstr "Skupiny modifikátorov" -#: ../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] "Odstrániť staré kľúče z {0} objektov" +msgstr[1] "Odstrániť staré kľúče z {0} objektu" +msgstr[2] "Odstrániť staré kľúče z {0} objektov" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Pridať novú vrstvu" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Odstrániť vybranú vrstvu." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Viac informácii o tejto vlastnosti" #. 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 "Voliteľné atribúty:" -#: ../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 "Použiť prednastavenie \"{0}\" zo skupiny \"{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 "Použiť prednastavenie \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "uzavratá cesta" -#: ../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 "Neznány typ (druh): {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 @@ -7945,15 +8714,15 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {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 "Chyba rozkladania(parsovania) {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 "Elementy typu(druhu) {0} sú podporované." -#: ../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 @@ -7964,22 +8733,22 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../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 "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Zmeniť vlastnosti" -#: ../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}''" @@ -8018,11 +8787,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 "Nemôžem čítať \"{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 " @@ -8032,38 +8801,38 @@ "GPL licencoiu." -#: ../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 "GPX súbory" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "popis gps trasy" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Pridať informáciu o autorovi" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Skutočné meno" -#: ../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 "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Preddefinované" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Kľúčové slová" @@ -8073,9 +8842,9 @@ msgstr "Možnosti exportu" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportovať a Uložiť" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8086,10 +8855,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 "Zvoľte preddefinovanú licenciu" -#: ../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 @@ -8099,12 +8868,12 @@ msgstr "Značky z {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 "Súbor \"{0}\" neexistuje" -#: ../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" @@ -8127,6 +8896,6 @@ "pôvodných" -#: ../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 @@ -8136,10 +8905,20 @@ msgstr "Sťahujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 -#, java-format -msgid "Fetching {0} with id {1} from ''{2}''" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#, fuzzy, java-format +msgid "Fetching node with id {0} from ''{1}''" msgstr "Donášam {0} s id {1} z ''{2}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, fuzzy, java-format +msgid "Fetching way with id {0} from ''{1}''" +msgstr "Donášam {0} s id {1} z ''{2}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#, fuzzy, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "Donášam {0} s id {1} z ''{2}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8147,10 +8926,20 @@ "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 -#, java-format -msgid "Fetching a package of {0} from ''{1}''" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#, fuzzy, java-format +msgid "Fetching a package of nodes from ''{0}''" msgstr "Donášam balíček z {0} pre ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#, fuzzy, java-format +msgid "Fetching a package of ways from ''{0}''" +msgstr "Donášam balíček z {0} pre ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#, fuzzy, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "Donášam balíček z {0} pre ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8160,34 +8949,34 @@ "pre každý pôvodný" -#: ../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 súbory" -#: ../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 "Importované súradnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Poškodené údaje(vety): " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Chyby v kontrolnom súčte: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Neznáme údaje(vety): " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Nulové súradnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA import úspešný" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA import zlyhal!" @@ -8198,5 +8987,5 @@ msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať 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 "" @@ -8204,5 +8993,5 @@ "nastaveniach." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8213,15 +9002,15 @@ "{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 "Komunikácia s {0} je ustálená, používa protokol verzie {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 "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8231,33 +9020,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 "Otváranie kontroly..." -#: ../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 "Otváranie kontroly..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Otváranie kontroly..." + +#: ../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 "Otváranie kontroly..." + +#: ../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 "Zatváranie kontroly..." -#: ../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 "Zatváranie kontroly..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Otváranie kontroly..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Nie sú prítomné zmenené súbory(changeset) pre diff nahratie." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Nahrávam..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " msgstr "Čakanie 10 sekúnd ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, fuzzy, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "Spúšťam opakovanie {0} z {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "OK - skúšam znovu." -#: ../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}." @@ -8285,29 +9132,33 @@ msgstr "Poškodený bz2 súbor." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Nesprávne heslo alebo meno." -#: ../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 "Upozornenie: Heslo sa posiela nešifrované." -#: ../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 "Uložiť meno a heslo (nešifrovane)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Zadajte heslo" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Prihlásenie" -#: ../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 "Základná URL pre OSM server (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Prihlasovacie meno (e-mail) pre OSM konto." -#: ../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." @@ -8315,13 +9166,17 @@ "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Základná Serverová URL" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM užívateľské meno (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 heslo" -#: ../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." @@ -8333,15 +9188,15 @@ "
Nepoužite vzácne Heslo." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Súbory OSM Servera" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "Očakávaný príklad z OsmDataLayer. Got ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" @@ -8349,5 +9204,5 @@ "Nejaká chyba nastala počas ukladania.
Chyba je:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8358,5 +9213,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8563,24 +9418,24 @@ "internetu." -#: ../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} ostáva. Odosielam {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 "" -"Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového limitu " -"servera. Výnimka bola: {1}" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 -#, java-format +#: ../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} ostáva. Odosielam {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} ostáva. Odosielam {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#, fuzzy, 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." +"use diff uploads, but API is not able to handle them. Ignoring diff upload." msgstr "" "UPOZORNENIE: preferencie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " @@ -8588,15 +9443,25 @@ "Ignorujem zmenu nastavení." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 +#, fuzzy +msgid "Starting to upload in one request ..." +msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 +#, fuzzy +msgid "Starting to upload with one request per primitive ..." +msgstr "Chyba pri aktualizácii vybraných pôvodných." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update Plugins" msgstr "Aktualizácia pluginov" -#: ../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 "Stiahnuť pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8609,5 +9474,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." @@ -8617,23 +9482,23 @@ msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte 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 "Sťahujem Pluginy {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Vynechať sťahovanie" -#: ../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 verzia {0} požadovaná pre plugin {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Stiahnuť Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Vynechať Sťahovanie" @@ -8644,5 +9509,5 @@ msgstr "Nastala chyba v plugine {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." @@ -8650,25 +9515,25 @@ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej potrebný." -#: ../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 "Plugin {0} požaduje JOSM aktualizáciu na verziu {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 "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {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 "Plugin nenájdený: {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 "Pluginy boli naposledy aktualizované pred {0} dňami." -#: ../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 " @@ -8678,21 +9543,21 @@ "the config option '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 "Vypnúť doplnok" -#: ../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 "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Zachovať plugin" -#: ../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 " @@ -8702,5 +9567,5 @@ "ich prepísaniu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8709,10 +9574,10 @@ "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{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 "Podľa informácie v doplnku jeho autorom je ''{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." @@ -8720,9 +9585,9 @@ "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby." -#: ../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 "Vypnúť doplnok?" -#: ../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 " @@ -8732,13 +9597,13 @@ "prestal používať." -#: ../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 "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "Informácia o pluginoch" -#: ../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" @@ -8749,5 +9614,5 @@ msgstr "Viac detailov" -#: ../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" @@ -8757,18 +9622,18 @@ msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Nenájdené informácie o plugine" -#: ../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 "Plug-in {0} nie je dostupný. Aktualizácia preskočená." -#: ../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 "Všetky nainštalované pluginy sú aktuálne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8781,9 +9646,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 "Stiahnuť chýbajúca pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8796,35 +9661,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}: Verzie {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 "Plugin je zahrnutý v 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 "Chyba čítania súboru informací o plugine: {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 "Toto je až za koncom nahrávky" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Chyba prehrávánia zvuku" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Neurobiť nič" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Nahlásiť chybu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8838,18 +9703,18 @@ "chybe." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Neočakávaná chyba programu." -#: ../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 "Prosíme napíšte chybovú správu v {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 "Opíšte (detailne) kroky, ktoré vedú k chybe." -#: ../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 " @@ -8859,19 +9724,19 @@ "hlásením chyby." -#: ../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 "Prosím pripojte nasledujúcu informáciu:" -#: ../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 "(Text už bol skopírovaný do schránky.)" -#: ../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 "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {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 "" @@ -8882,5 +9747,5 @@ "Výnimka bola: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8891,5 +9756,5 @@ "problém. JOSM prestane pracovať." -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8902,5 +9767,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" @@ -8910,5 +9775,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8919,17 +9784,17 @@ "\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 "(Pomoc: Skratky môžeš modifikovať v nastaveniach)" -#: ../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 "Varovanie:neúspešné čítanie MOTD z ''{0}''. Výnimka bola: {1}" -#: ../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 "" @@ -8939,4 +9804,39 @@ "Varovanie: neúspešná čítanie MOTD z ''{0}'' pre bezpečnostný dôvod. Výnimka " "bola: {1}" + +#: ../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 "" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 @@ -8964,9 +9864,27 @@ msgstr "Vytvoriť cestnú sieť" -#: ../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 "Nahrať stopu" -#: ../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 @@ -8974,27 +9892,40 @@ msgstr "Nahrať Stopy (Traces)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Verejné" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Vybratá verejne prístupná stopa (trace) v 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 "Popis" -#: ../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 "Prosím zapíšte popis a vašej stope(trace)" -#: ../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 "Prosím zapíšte značky o vašej stope(trace)" -#: ../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}" @@ -9002,47 +9933,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 "Pripájam sa..." -#: ../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 "Nahrávanie je zrušené" -#: ../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 "Chyba počas nahrávania" -#: ../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 "Nahratie GPS stopy bolo úspešné" -#: ../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 "Chyba pri nahrávaní. Server napísal nasledujúcu správu: " -#: ../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 "Nahrávam GPS stopu(track): {0}% ({1} of {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 "Nie je poskytnutý žiaden popis. Prosím doplňte nejaký popis" -#: ../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 "Nie je vybratá GPX vrstva. Nemôžem nahrať stopu (trace)." -#: ../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 "Nie je doplnené užívateľské meno." -#: ../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 "Nie je doplnené heslo." -#: ../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 "Nahrávam GPX stopu (track)" @@ -9155,19 +10086,19 @@ msgstr "Načítať sadu obrázkov na novú vrstvu." -#: ../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 "Súbory 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 "Súbor {0} je ešte nahratý pod menom \"{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 "Chyba pri rozkladaní {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." @@ -9179,34 +10110,34 @@ "html>" -#: ../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 "Čas fotografie (z 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 čas (čítaj nad fotografiou) " -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "Som v časovej zóne: " -#: ../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 "Žiaden dátum" -#: ../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 "Otvoriť inú fotografiu" -#: ../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 "Synchronizovať čas z fotky a GPS prímača" -#: ../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" @@ -9216,70 +10147,70 @@ "Prosím použite požadovaný formát." -#: ../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 "Neplatný dátum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 stopa(trasa): " -#: ../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 "Otvoriť inú GPX stopu(trasu)" -#: ../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 "Časové pásmo: " -#: ../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 "Vyrovnať(Offset):" -#: ../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 "" "Môžem použiť obrázok z môjho GPS prímača.
Môže toto pomôcť?" -#: ../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 "Aktualizovať pozíciu pre: " -#: ../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 "Všetky obrázky" -#: ../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 "Obrázky bez exif pozície" -#: ../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 "Zatiaľ neoznačkované obrázky" -#: ../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 "Zladiť obrázky s GPX stopou(track)" -#: ../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 "Zladiť" -#: ../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 "Auto-Guess" -#: ../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 "Môžete vybrať GPX stopu(track)" -#: ../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 "Nevybratá GPX stopa(track)" -#: ../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 "" @@ -9290,9 +10221,9 @@ "Čakám na formát: {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 "Neplatné časové pásmo" -#: ../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 "" @@ -9303,65 +10234,65 @@ "Čakám na formát: {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 "Neplatné vyrovnanie (offset)" -#: ../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 "Najdené {0} zhody z {1} v GPX stope {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 "Nahratá GPX stopa(trasa)" -#: ../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 "Vybraté fotografie neobsahujú informácie o čase." -#: ../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 "Fotografie neobsahujú informácie o čase." -#: ../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." msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." -#: ../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 Stopa nemá informáciu o čase." -#: ../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 "Časové pásmo: {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 "Minút: {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 "Sekúnd: {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 "Zladené {0} z {1} fotiek k GPX stope." -#: ../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 "(Časový rozdiel z {0} dní)" -#: ../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 "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" -#: ../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 " @@ -9371,13 +10302,13 @@ "posúvač ručne na fotky." -#: ../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 "Priraďovanie fotiek ku stope(track) zlyhalo" -#: ../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 "Nastaviť časové pásmo a vyváženie(offset)" -#: ../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 "Východzie hodnoty" @@ -9398,5 +10329,5 @@ msgstr "Chyba v súbore {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9405,16 +10336,18 @@ "(No = new cache)" msgstr "" +"Umiestnenie \"{0}\" vyhľadané v cache.\n" +"Najskôr načítať cache?\n" +"(Nie = nová cache)" #. this below is a temporary workaround to fix the "always on top" issue #. 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 "Vybrať všetko" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +msgstr "Vybrať Feuille" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" @@ -9443,8 +10376,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 "" "Mesto/obec {0} je nenájdená, alebo nedostupná na WMS.\n" @@ -9455,21 +10388,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 "Vybrať hranice obce(samosprávy)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Vybrať z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Automatické získavanie" -#: ../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" @@ -9481,37 +10414,51 @@ "Budete si želať obnoviť F11 pre grabovanie?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Obnoviť klávesovú skratku pre grabovanie F11" -#: ../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 "JOSM ja zastavený aby zmeny mohli byť prevedené" -#: ../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 "" +"Varovanie: neúspešná voľba umiestniť panel dialógu vždy na vrchu. Výnimky " +"boli: {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Nahradiť pôvodné pozadie farbou JOSM pozadia." -#: ../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 "Opačná šedá farba (pre čierne pozadia)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Nastaviť priehľadné pozadie" -#: ../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 "Kresliť okraje okolo stiahnutých dát." -#: ../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 +#, fuzzy +msgid "Disable image cropping during georeferencing." +msgstr "Kliknite na druhý Lambertov priečnik (crosspiece) pre georeferencing\n" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Enable automatic caching." msgstr "Povoliť automatické cachovanie." -#: ../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 "Maximálna veľkost cache (v MB)" -#: ../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." @@ -9528,18 +10475,18 @@ "
predtým, ako nahráte nejaké dáta vytvorené týmto pluginom." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "French cadastre WMS (Francúzsky kataster 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 "Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Zdroj" -#: ../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 " @@ -9549,5 +10496,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). " @@ -9557,42 +10504,40 @@ "pre texty na tmavých pozadiach." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Povoliť vyrovnanie viacnásobných vrstiev" -#: ../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 "Nastaviť priehľadnosť WMS vrstiev" -#: ../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 "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera." #. 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 "Image grab multiplier:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128 +msgstr "Zachytávač vektorových obrázkov multiplikátor:" + +#: ../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 "" "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)" -#: ../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 "Pevná veľkosť štvorcov (východzia 100m)" -#: ../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 "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)" -#: ../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 "Image grab multiplier:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +msgstr "Zachytávač rastrových obrázkov multiplikátor:" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená" @@ -9650,12 +10595,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Kontaktujem WMS server..." +msgstr "Spájam cadastre WMS ..." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "Obrázok nie je nahratý" +msgstr "Obrázok je už načítaný" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9664,4 +10607,6 @@ "Use the normal Cadastre Grab menu." msgstr "" +"Obec je vektorizovaná !\n" +"Použite normálne Cadastre Grab menu." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20 @@ -9689,9 +10634,10 @@ #: ../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 +#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" "the current projection to one of the cadastre\n" -"projection and retry" +"projections and retry" msgstr "" "Zapnúť the cadastre WMS plugin, zmeniť\n" @@ -9699,55 +10645,75 @@ "projekcií a opakovať" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 msgid "Grab non-georeferenced image" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:65 +msgstr "Zachytený obrázok bez zemepisných súradníc" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68 msgid "Georeferencing interrupted" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:95 +msgstr "Určovanie zemepisných súradníc prerušené" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 msgid "" "Click first corner for image cropping\n" "(two points required)" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116 +"Kľukni na prvý roh pre orezanie obrázka\n" +"(povinné sú dva body)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 +#, fuzzy +msgid "Image cropping" +msgstr "nahrávam obrázok..." + +#: ../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 +msgstr "Kľukni na druhý roh pre orezanie obrázka" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 msgid "" "Click first Lambert crosspiece for georeferencing\n" "(two points required)" 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 +"Kliknite na prvý Lambertov priečnik (crosspiece) pre georeferencing\n" +"(povinné sú dva body)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 #, fuzzy +msgid "Image georeferencing" +msgstr "Zachytený obrázok bez zemepisných súradníc" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 +#, fuzzy +msgid "Click second Lambert crosspiece for georeferencing" +msgstr "Kliknite na druhý Lambertov priečnik (crosspiece) pre georeferencing\n" + +#: ../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 "Vložiť Šírku/Dĺžku pre skok na miesto." - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149 +msgstr "Vstúpiť do cadastre na východ, sever pozícii" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +msgstr "(Varovanie: potvrdte sever so šípkou !!)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 +msgid "East" +msgstr "Východ" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 +msgid "North" +msgstr "Sever" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "East" -msgstr "východ" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "sever" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Ponechaj ich súradnice" +msgid "Set " +msgstr "Výber" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9809,8 +10775,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25 msgid "Export as PNG format (only raster images)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +msgstr "Exportovať ako PNG formát (iba rastrové obrázky)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9835,6 +10801,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 "Prázdna vrstva" @@ -9850,7 +10816,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Stred rastra: {0}" +msgstr "Veľkosť rastra: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10379,6 +11345,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 "voda" @@ -10391,8 +11357,4 @@ msgid "land" msgstr "zem" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "žiadny" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10687,9 +11649,9 @@ msgstr "OpenStreetBugs sťahovaná slučka" -#: ../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 "Zobrazuje chyby z 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 " @@ -10701,5 +11663,5 @@ "(Veľmi odporúčame)" -#: ../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 "Prejsť na nový openstreetbugs server?" @@ -11277,5 +12239,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 "Názov ulice" @@ -11294,29 +12256,29 @@ msgstr "Zobraziť panel autorov(spracovateľov)" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Otvoriť stránku uživateľa" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Otvoriť stránku uživateľa v prehliadači" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Vybrať dáta uživateľa" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Vymeniť výber s dátami užívateľa" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Prosím vyberte nejaké dáta" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Prosím vyberte si užívateľa pre používanie author panel" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Prepáčte, nefunguje s anonymnými uživateľmi." @@ -11330,23 +12292,15 @@ msgstr "Spojiť plochy ktoré sa prekrývajú" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Pokračovať akokoľvek" - -#: ../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 "Teraz môžu byť spojené iba dve plochy(areas)." -#: ../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}\" niesú uzavreté a preto nemôžu byť spojené.." -#: ../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" @@ -11358,38 +12312,38 @@ "Ste si naozaj istý, že chcete pokračovať?" -#: ../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 "Prosím prerušiť ak ste si nie istý" -#: ../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 "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Pridať body na všetky priesečníky" -#: ../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 "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Oprava relácie" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Spojená prekrývajúca sa plocha" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Spojené prekrývajúce sa plochy" -#: ../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 " @@ -11399,82 +12353,82 @@ "overte či to nepredstavuje nejakú chybu." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Oprava konfliktu (rozporu) značiek" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Odstránený Prvok z Relácií" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Spojiť plochy: Vymazať krátke cesty" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Uzavretá cesta" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Vymazať značky z vnútorných ciest" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funkcie Spojenia Plôch (Join Areas Function)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Skok na miesto (pozíciu)" -#: ../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 "Otvoriť dialógové okno, aby bol umožnený skok na konkrétne miesto" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Vložiť Šírku/Dĺžku pre skok na miesto." -#: ../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 "Môžete tiež vložiť nejakú URL z www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zväčšenie (v metroch)" -#: ../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 "Skok tam" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Skok na miesto (pozíciu)" -#: ../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 "" "Nemôžem zistiť Šírku, Dĺžku, alebo Zväčšenie(zoom). Prosím skontrolujte to." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Niesom schopný vyčítať Šírku/Dĺžku" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Zjednodušiť cestu" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Zmazať nepotrebné body z cesty." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Vyberte aspoň jednu cestu k zjednodušeniu." -#: ../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?" @@ -11485,25 +12439,25 @@ msgstr[2] "Výber obsahuje {0} ciest. Naozaj ich chcete zjednodušiť?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Ste si istý?" -#: ../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 "Overovanie chýb" -#: ../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 "Žiadne chyby na overenie" -#: ../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 "Mriežka" -#: ../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 "" @@ -11596,53 +12550,53 @@ msgstr "Vykonať overovanie dát" -#: ../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 "Dáta majú chyby. Ak napriek tomu ich nahrať?" -#: ../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 "Otvoriť okno pre overovanie." -#: ../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 "Priblížiť na problém" -#: ../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 "Opraviť" -#: ../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 "Opraviť vybraté chyby." -#: ../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 "Ignorovať" -#: ../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 "Nabudúce ignorovať vybraté chyby." -#: ../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 "Celá skupina" -#: ../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 "Jednotlivé prvky" -#: ../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 "Nič" -#: ../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 "Ignorovať celú skupinu, alebo jednotlivé prvky?" -#: ../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 "Ignorujem prvky(elements)" -#: ../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" @@ -11666,23 +12620,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 "" "Tento test kontroluje prítomnosť ciest, železníc a vodných ciest, ktoré sa " "krížia v rovnakej vrstve, ale nie sú spojené spoločným bodom." -#: ../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 "Vytvoriť budovy" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Zkrížené cesty" -#: ../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 "Duplicitné body" -#: ../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 "Tento test zisťuje či nie je viac bodov na jednom mieste." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Body s rovnakými názvami" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Potvrdenie" + +#: ../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 "Duplikát cesty" + +#: ../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 "Tento test zisťuje či nie je viac bodov na jednom mieste." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Vytvoriť duplikát cesty" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11769,23 +12756,23 @@ msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep." -#: ../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 "Kontrola vlastností :" -#: ../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 "Tento plugin kontroluje chyby kľúčov a ich hodnôt." -#: ../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 "Neplatný tagchecker line - {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 "Neplatný spellcheck line: {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 "" @@ -11796,7 +12783,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 "Neplatná kombinácia klúča/hodnoty" @@ -11804,81 +12791,81 @@ #. 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 "Problém s vykresľováním" -#: ../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 "Klúč ''{0}'' je neplatný." -#: ../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 "Klúče s prázdnými hodnotami" -#: ../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 "Neplatné vlastnosti kľúča" -#: ../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 "Neplatná medzera vo vlastnosti klúča" -#: ../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 "Hodnota začíná alebo končí medzerou" -#: ../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 "Hodnota obsahuje HTML entitu" -#: ../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 "Kľúč ''{0}'' nie je predvolený." -#: ../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 "Predvoľba neobsahuje vlastnosti kľúča" -#: ../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 "Hodnota ''{0}'' pre kľúč ''{1}'' nie je predvolená." -#: ../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 "Predvoľba neobsahuje vlastnost hodnoty" -#: ../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 "Kontrola vlastností kľúčov." -#: ../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 "Kontroluje platnosť vlastností kľúčov proti zoznamu slov." -#: ../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 "Použíť komplexnú kontrolu vlastností" -#: ../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 "" "Kontroluje platnosť hodnôt a tagů(značiek) pomocou komplexných pravidel." +#: ../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 source" -#: ../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." @@ -11889,82 +12876,82 @@ "značiek." -#: ../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 "Pridať nový zdroj do zoznamu." -#: ../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 "Upraviť zvolený zdroj." -#: ../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 "Zdroje dát" -#: ../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 "Kontrola vlastností hodnôt ." -#: ../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 "Kontroluje platnosť vlastností hodnôt proti prednastaveným hodnotám." -#: ../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 "Kontrola pre 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 "Pohľad pre body, alebo cesty s FIXME v hodnotách vlastností." -#: ../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 "Kontrola pre poznámky (notes)" -#: ../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 "Kontrola či pri kreslení mapy nevznikli chyby." -#: ../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 "Použite štandardný dátový súbor." -#: ../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 "Použite štandardný dátový súbor (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 msgid "Use default tag ignore file." msgstr "Použite východzie značky ignorovaného súboru." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use the default tag ignore file (recommended)." msgstr "Použite východzie značky ignorovaného súboru (doporučené)." -#: ../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 "Použite štandardný spellcheck súbor." -#: ../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 "Použite štandardný spellcheck súbor (doporučené)." -#: ../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 "Oprava vlastností" -#: ../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 "Nemôžem nájsť typ elementu" -#: ../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 "Nemôžem nájsť úroveň varovania." -#: ../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 "Neplatný výraz ''{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}''" @@ -12111,7 +13098,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 "budovy" @@ -12125,5 +13112,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 "oblasť(plocha)" @@ -12263,5 +13250,5 @@ msgstr "Je dosiahnuté spojenie" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Nastavenie výnimky" @@ -12328,14 +13315,14 @@ msgstr "Nápoveda WMS Pluginu" -#: ../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 "Prekreslený obrázok..." -#: ../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 "Sťahovať Rectified Images From Various Services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12346,26 +13333,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 "Obvyklý WMS Link" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Podporovaný Rectifier Services:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Navštívte domovská stránku" -#: ../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 alebo Image 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 "Pridať Rectified Image" -#: ../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 " @@ -12375,37 +13362,55 @@ "skúste znovu." -#: ../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 "Neplatná WMS URL alebo id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Nastaviť 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 "Nastavte polohu vybratej WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." msgstr "Prosím vybrať WMS vrstvu pre nastavenie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" msgstr "Vybrať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" msgstr "Žačať nastavovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 msgid "There are currently no WMS layer to adjust." msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 msgid "No layers to adjust" msgstr "Žiadne vrstvy na nastavovanie" -#: ../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 "" @@ -12421,15 +13426,43 @@ msgstr "Automatické sťahovanie" -#: ../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 "Aktivovať" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {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 vrstva ({0}), sťahovaná vo zväčšení (zoom) {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 "Neplatný dátum" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12437,90 +13470,102 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../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}" msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../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 "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Nastavenie WMS Pluginu" -#: ../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 "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu" -#: ../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 "Meno v menu" -#: ../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 URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Meno v menu (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS URL (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Zadajte meno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Skopírovať východzí" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Kopírovať východzie" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Zvoľte minimálne jednu cestu." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Stahovač:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "TCX Súbory (*.tcx)" #. * @@ -12933,62 +13978,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 "Ref. číslo" - -#. 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 "Vrstva" #. item "Streets/Motorway" combo "Layer" @@ -13003,5 +13993,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 "Jazdné pruhy" @@ -13016,5 +14006,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" @@ -13024,10 +14013,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 "Max. rýchlosť (km/h)" @@ -13071,9 +14060,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 "Jednosmerka" @@ -13121,13 +14110,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 "Most" @@ -13169,13 +14158,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 "Tunel" @@ -13215,12 +14204,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 "Výkop" @@ -13260,12 +14249,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 "Násyp" @@ -13421,17 +14410,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 "Šírka (v metroch)" @@ -13458,4 +14447,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" @@ -13474,11 +14464,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 "Povrch" @@ -13488,4 +14479,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" @@ -13500,9 +14492,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 "spevnený" @@ -13510,10 +14503,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 "nespevnený" + +#: 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 "Chata" + +#: 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 "betón (concrete)" + +#: 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 "Požičovňa" + +#. 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 "drevo (wood)" + +#: 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 "parkovacie lístky" #. item "Ways/Track Grade 2" combo "Surface" @@ -13521,12 +14577,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 "dlažbová kocka (cobblestone)" + +#: 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 "štrk (gravel)" + +#: 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 "dlažbová kocka (cobblestone)" + +#: 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 "neúplný" + +#: 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 "tráva (grass)" + +#: 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 "tráva (grass)" + +#: 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 "piesok (sand)" + +#. 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 "zem (ground)" #. item "Streets/Residential" text "Width (meters)" @@ -13607,20 +14745,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Cestné obmedzenie" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Upraviť cestné obmedzenie" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Mýto (Toll)" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Slepá ulica" @@ -13633,8 +14771,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 "Prístup" @@ -13669,32 +14807,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 "áno" @@ -13707,40 +14860,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 "private (len pre vlastníka)" -#: 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 "určený" @@ -13753,19 +14906,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 "miesto určenia (cieľ)" @@ -13788,65 +14941,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 "permissive (súhlas vlastníka pozemku)" -#: 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 "farmársky (agricultural)" -#: 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 "nie" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Malé nákladná autá a dodávky" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Nákladné vozidlá" @@ -13861,10 +15019,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 "Kôň" @@ -13880,17 +15038,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 "Motocykel" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13902,30 +15059,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 "Motorové vozidlo" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Dopravná obsluha" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorová loď" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Loď" #. 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 "Min. rýchlosť (km/h)" @@ -13933,25 +15090,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 "Max. hmotnosť (ton)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. Výška(v metroch)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. Šírka (v metroch)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. Dĺžka (v metroch)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Kruhový objazd" @@ -13962,5 +15119,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 "Upraviť kruhový objazd" @@ -13976,5 +15133,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" #. @@ -13982,9 +15139,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 "Typ" @@ -14004,10 +15161,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 "dialnica (motorway)" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "dialničná prípojka" @@ -14029,10 +15186,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 "cesta pre motorové vozidlá (trunk)" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "prípojka cesty pre motorové vozidlá" @@ -14054,10 +15211,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 "cesta prvej triedy" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "prípojka cesty I. triedy" @@ -14079,5 +15236,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" @@ -14092,9 +15249,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "cesta tretej triedy" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "cesta bez klasifikácie (unclassified)" @@ -14108,9 +15265,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "obytná (osídlená)" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "obytná zóna" @@ -14140,10 +15297,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 "obslužná (service)" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "autobusová linka" @@ -14173,6 +15330,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 "konštrukcia" @@ -14183,10 +15340,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 "Editácia mosta" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Upraviť Tunel" @@ -14194,19 +15351,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Cesty" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Stavba" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Upraviť komunikáciu vo výstavbe" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Križovatka" @@ -14222,5 +15379,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "kruhový objazd (roundabout)" @@ -14229,5 +15386,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Cesta pre kone" @@ -14235,5 +15392,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Upraviť cestu pre kone" @@ -14241,5 +15398,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Cesta pre cyklistov" @@ -14249,11 +15406,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 "Upraviť cyklistickú cestu" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Pešia zóna" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Chodník" @@ -14262,11 +15425,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Upraviť chodník" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Špičky (hroty)" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Pešia zóna" @@ -14275,5 +15444,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Upraviť pešiu zónu" @@ -14281,5 +15450,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Schody" @@ -14289,5 +15458,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 "Upraviť únikové schody" @@ -14296,5 +15465,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Poľná cesta (Track)" @@ -14303,39 +15472,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Upraviť Stopu (Track)" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "betón (concrete)" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "štrk (gravel)" - -#. 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 "zem (ground)" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "tráva (grass)" - -#: 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 "piesok (sand)" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Kvalita stopy poľnej cesty 1" @@ -14344,5 +15485,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Upraviť kvalitu stopy poľnej cesty 1" @@ -14350,5 +15491,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Kvalita stopy poľnej cesty 2" @@ -14357,5 +15498,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Upraviť kvalitu stopy poľnej cesty 2" @@ -14363,5 +15504,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Kvalita stopy poľnej cesty 3" @@ -14370,5 +15511,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Upraviť kvalitu stopy poľnej cesty 3" @@ -14376,5 +15517,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Kvalita stopy poľnej cesty 4" @@ -14383,5 +15524,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Upraviť kvalitu stopy poľnej cesty 4" @@ -14389,5 +15530,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Kvalita stopy poľnej cesty 5" @@ -14396,5 +15537,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Upraviť kvalitu stopy poľnej cesty 5" @@ -14403,5 +15544,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Cesta (chodník)" @@ -14410,19 +15551,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Upraviť cestu (chodník)" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Lyže" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Snežný skúter" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Lyže" - #. 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 "Turistika" @@ -14432,5 +15576,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 "Upraviť Turistiku" @@ -14438,5 +15582,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Horská turistika" @@ -14446,5 +15590,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 "Upraviť horskú turistiku" @@ -14452,5 +15596,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Náročná horská turistika" @@ -14460,5 +15604,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 "Upraviť náročnú horskú turistiku" @@ -14466,5 +15610,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Vysokohorská turistika" @@ -14474,5 +15618,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 "Upraviť vysokohorskú turistiku" @@ -14480,5 +15624,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Náročná vysokohorská turistika" @@ -14488,5 +15632,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 "Upraviť náročnú vysokohorskú turistiku" @@ -14494,5 +15638,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Tažká vysokohorská turistika" @@ -14502,5 +15646,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 "Upraviť ťažkú vysokohorskú turistiku" @@ -14508,10 +15652,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Cestné objekty" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Ďialničná križovatka" @@ -14519,15 +15663,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Upraviť diaľničnú križovatku" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Číslo" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Služby" @@ -14535,5 +15679,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Upraviť servisnú stanicu (autoservis)" @@ -14547,4 +15691,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" #. @@ -14564,18 +15710,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 "Operátor" @@ -14584,5 +15732,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Semafor" @@ -14592,5 +15740,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Typ prechodu pre chodcov" @@ -14599,27 +15747,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 "neriadený" -#: 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 "semafor" -#: 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 "ostrovček" -#: 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 "neoznačený" #. 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 "Prechod pre jazdcov na koňoch" @@ -14627,6 +15775,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 "Prechod pre cyklistov" @@ -14635,11 +15783,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 "Prechod cez cestu s obsluhou" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)" @@ -14647,31 +15795,31 @@ #. 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 "prechod pre chodcov (zebra)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "prechod pre chodcov (len čiarkované okraje)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "" "pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Zastaviť (stop)" @@ -14679,5 +15827,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Prechod pre chodcov" @@ -14686,14 +15834,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Upraviť križovanie" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Typ mena (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Malý kruhový objazd" @@ -14704,14 +15852,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 "Smer" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "v smere hodinových ručičiek (pravotočivý)" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)" @@ -14721,20 +15869,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 "Hranica mesta/obce" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Upraviť označenie hranice mesta/obce" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Druhé meno" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Kamera na meranie rýchlosti" @@ -14742,5 +15890,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Núdzový telefón" @@ -14748,5 +15896,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Sklon" @@ -14754,5 +15902,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Prudký sklon" @@ -14761,10 +15909,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Brod" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Upraviť brod" @@ -14772,5 +15920,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Horský priesmyk" @@ -14778,5 +15926,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Upraviť horský priesmyk" @@ -14784,11 +15932,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 "Nadmorská výška" @@ -14796,5 +15944,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Prekážka (Barriers)" @@ -14802,5 +15950,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Stĺpik" @@ -14808,5 +15956,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Upraviť stĺpik" @@ -14851,16 +15999,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 "Povolená prevádzka:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Cyklo prekážka (Cycle Barrier)" @@ -14869,5 +16017,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Balvan (Block)" @@ -14875,5 +16023,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "" @@ -14883,5 +16031,5 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "" @@ -14890,5 +16038,5 @@ #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)" @@ -14896,15 +16044,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Špičky (hroty)" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Upraviť Hroty" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Mýtna búdka" @@ -14912,5 +16060,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Upraviť mýtnu búdku" @@ -14918,10 +16066,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Hraničná kontrola" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Upraviť hraničnú kontrolu" @@ -14931,5 +16079,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Živý plot (Hedge)" @@ -14938,5 +16086,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Plot" @@ -14945,5 +16093,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Hradby" @@ -14951,5 +16099,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Mestské hradby" @@ -14958,5 +16106,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Oporný múr" @@ -14968,15 +16116,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Vstup" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Upraviť vstup" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Brána" @@ -14984,50 +16132,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Upraviť bránu" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Závora (Lift Gate)" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Upraviť závoru (Lift Gate)" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Brána pre zvieratá (Hampshire)" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Upraviť bránu pre zvieratá (hampshire)" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Brána pre otváranie predkom auta (bump)" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Upraviť bránu pre otváranie predkom auta (bump)" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Automatická brána pre hospodárske zvieratá (Kissing)" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Turniket (Stile)" @@ -15035,25 +16183,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Upraviť turniket" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1017 +#: build/trans_presets.java:1022 msgid "Turnstile" -msgstr "" - -#. item -#: build/trans_presets.java:1018 +msgstr "Turniket" + +#. item +#: build/trans_presets.java:1023 msgid "Edit Turnstile" -msgstr "" +msgstr "Upraviť Turniket" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1026 +#: build/trans_presets.java:1031 msgid "Sally Port" msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "" @@ -15066,10 +16214,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 "Voda" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Prameň" @@ -15077,5 +16225,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Upraviť prameň" @@ -15083,5 +16231,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Odvodňovací kanál, odtok" @@ -15089,10 +16237,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Upraviť odvodňovací kanál, odtok" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Potok" @@ -15100,10 +16248,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Upraviť potok" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Prieplav" @@ -15111,10 +16259,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Upraviť prieplav" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Rieka" @@ -15124,5 +16272,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 "Upraviť rieku" @@ -15130,15 +16278,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Upraviť vodu" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Zem (Pevnina)" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Upraviť Zem (Pevnina)" @@ -15146,15 +16294,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Basin (Kotvisko pre lode)" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Upraviť Basin (Kotvisko pre lode)" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Nádrž" @@ -15162,15 +16310,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Upraviť nádrž" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Krytá nádrž" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Upraviť krytú nádrž" @@ -15178,5 +16326,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Riečny breh" @@ -15185,10 +16333,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Upraviť riečny breh" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Mokraď" @@ -15199,14 +16347,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 "Upraviť mokraď" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Močiar" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "slatina" @@ -15220,35 +16368,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "močiar (marsh)" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "mokraď´s rákosím" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "soľná bažina" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "prílivová oblasť" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangrovová oblasť" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Blato" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Upraviť blato" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Pláž" @@ -15256,20 +16404,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Upraviť pláž" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Záliv" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Upraviť záliv" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Útes" @@ -15277,10 +16425,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Upraviť útes" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Pobrežie" @@ -15288,5 +16436,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Upraviť pobrežie" @@ -15294,5 +16442,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Prievoz, trajekt" @@ -15300,5 +16448,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Upraviť prievoz, trajekt" @@ -15307,5 +16455,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Lodenica" @@ -15313,10 +16461,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Upraviť lodenicu" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dok, prístavná hrádza" @@ -15324,5 +16472,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Upraviť dok, prístavnú hrádzu" @@ -15330,5 +16478,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Priehrada, nádrž" @@ -15336,15 +16484,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Upraviť priehradu, nádrž" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Vodné objekty" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Plavebná komora" @@ -15353,5 +16501,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Priehradzka" @@ -15359,20 +16507,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Upraviť priehradzku" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Vodopád" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Upraviť vodopád" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Turning Point (koniec cesty)" @@ -15381,15 +16529,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Prístav (Marina)" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Upraviť Prístav (Marina)" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Mólo" @@ -15397,10 +16545,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Upraviť mólo" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Prístavisko prievozu, trajektu" @@ -15408,10 +16556,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Upraviť prístavisko prievozu, trajektu" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)" @@ -15421,5 +16569,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 "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)" @@ -15427,10 +16575,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Železnica" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Železnica (štandardná)" @@ -15438,5 +16586,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Upraviť železničnú koľaj" @@ -15466,8 +16614,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 "Voliteľné typy" @@ -15481,35 +16629,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 "železničná vlečka v závode" -#: 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 "vedľajšia koľaj (napr: na stanici)" -#: 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 "železničná vlečka" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Úzkorozchodná železnica" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Upraviť úzkorozchodnú železnicu" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Jednokoľajka, vysutá dráha" @@ -15517,45 +16665,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Upraviť jednokoľajku, vysutú dráhu" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Historická železnica" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Upraviť zachovanú železnicu (v prevádzke)" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Rýchloelektrička" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Upraviť električku" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Upraviť metro" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Električka" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Upraviť električku" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Autobusová linka" @@ -15563,5 +16711,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Upraviť autobusovú linku" @@ -15570,14 +16718,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Nepoužívaná železnica" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Upraviť nepoužívanú železnicu" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Opustená železnica" @@ -15586,5 +16734,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Železničné priecestie" @@ -15593,5 +16741,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Peší prechod cez železnicu" @@ -15601,5 +16749,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Typy prechodov cez cestu" @@ -15607,5 +16755,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Točňa" @@ -15614,10 +16762,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Lanovka" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Sedačková lanovka" @@ -15625,10 +16773,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Upraviť sedačkovú lanovku" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)" @@ -15636,5 +16784,5 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "" @@ -15642,5 +16790,5 @@ #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Kabínková lanovka" @@ -15648,10 +16796,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Upraviť kabínkovú lanovku" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Gondola" @@ -15659,5 +16807,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Upraviť Gondolu" @@ -15665,5 +16813,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 "Stanica" @@ -15674,10 +16822,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 "Upraviť stanicu" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Čerpacia stanica" @@ -15687,9 +16835,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 "Upraviť čerpaciu stanicu" #. 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 "Otváracia doba" + +#. 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" @@ -15709,106 +17086,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Upraviť parkovisko" #. 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 "Referenčné číslo" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "mnohoposchodový" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "povrch" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "podzemie" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "záchytné parkovisko so zastávkou MHD" + +#. 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 "Poplatok" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapacita" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Miesta pre vozíčkárov" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Miesta pre vozíčkárov" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Miesta pre vozíčkárov" + +#: 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 "Umývačka" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Upraviť umývačku aut" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Obchod" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Upraviť obchod s autami" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Servis" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Upraviť autoservis" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Požičovňa" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Upraviť autopožičovňu" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Upraviť parkovisko bicyklov" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapacita" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "povrch" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "mnohoposchodový" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "podzemie" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "záchytné parkovisko so zastávkou MHD" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Miesta pre vozíčkárov" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Poplatok" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Umývačka" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Upraviť umývačku aut" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Obchod" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Upraviť obchod s autami" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Servis" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Upraviť autoservis" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Požičovňa" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Upraviť autopožičovňu" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Upraviť parkovisko bicyklov" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Upraviť požičovňu bicyklov" @@ -15817,15 +17229,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Upraviť bicyklový obchod" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Hromadná doprava" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -15833,5 +17245,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železničná zastávka" @@ -15839,5 +17251,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Upraviť zastávku" @@ -15845,5 +17257,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Zastávka električky" @@ -15852,5 +17264,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Upraviť zastávku električky" @@ -15858,5 +17270,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železničné nástupište" @@ -15865,5 +17277,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Upraviť železničné nástupište" @@ -15875,5 +17287,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 "Referencie (číslo stopy(track))" @@ -15881,10 +17293,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 "Oblasť" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Vchod do metra" @@ -15893,10 +17305,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Upraviť vchod do metra" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Invalidný vozík" @@ -15905,5 +17317,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Autobusová stanica" @@ -15912,5 +17324,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Upraviť autobusovú stanicu" @@ -15918,5 +17330,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Autobusová zastávka" @@ -15926,5 +17338,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 "Upraviť autobusovú zastávku" @@ -15933,8 +17345,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 "Prístrešok" @@ -15942,10 +17352,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Autobusové nástupište" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Upraviť autobusové nástupište" @@ -15953,5 +17363,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15959,5 +17369,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Upraviť stanicu taxíkov" @@ -15965,5 +17375,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Letisko" @@ -15971,15 +17381,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Upraviť letisko" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15988,5 +17398,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Ubytovanie" @@ -15998,5 +17408,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -16005,15 +17415,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Upraviť hotel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Hviezdičkový" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -16021,20 +17431,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Upraviť motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Penzión" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Upraviť penzión" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Chata" @@ -16042,10 +17452,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Upraviť chatu" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Ubytovňa" @@ -16053,30 +17463,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Upraviť ubytovňu" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Horská chata" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Upraviť horskú chatu" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Kemping pre obytné prívesy" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Upraviť kemping pre obytné prívesy" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Stanový tábor" @@ -16084,10 +17494,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Upraviť stanový tábor" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Jedlo + Pitie" @@ -16098,5 +17508,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Reštaurácia" @@ -16104,5 +17514,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Upraviť reštauráciu" @@ -16110,5 +17520,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 "Kuchyňa" @@ -16116,61 +17526,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 "talianska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "čínska" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "grécka" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "nemecká" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indická" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "regionálna" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turecká" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "ázijská" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thajská" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexická" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japonská" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Rýchle občerstvenie" @@ -16178,9 +17588,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Upraviť reštauráciu rýchleho občerstvenia" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kaviareň" @@ -16188,10 +17598,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Upraviť kaviareň" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Krčma" @@ -16199,20 +17608,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Upraviť krčmu" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Záhradná reštaurácia" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Upraviť záhradnú reštauráciu" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar (výčap)" @@ -16220,10 +17627,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Upraviť bar (výčap)" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Nočný klub" @@ -16231,33 +17637,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Upraviť nočný klub" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turistika" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Atrakcia" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Upraviť atrakciu" -#. 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 "Otváracia doba" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Múzeum" @@ -16265,10 +17662,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Upraviť múzeum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16277,10 +17673,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Upraviť zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Výhliadka" @@ -16288,25 +17683,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Upraviť výhliadku" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Výhliadková veža" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Zábavný park" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Upraviť zábavný park" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Umelecké dielo" @@ -16314,5 +17708,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Upraviť umelecké dielo" @@ -16320,86 +17714,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Informačná kancelária" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Upraviť informačnú kanceláriu" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Typ mapy" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "mapa" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "mapa mesta" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "turistická mapa" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "cykloturistická mapa" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Zastaviť (stop)" + +#. 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 "ulica" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "čínska" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Stiahnuť plochu" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Vložiť" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Mesto (city)" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "regionálna" #. 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 "Bližší popis" #. 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 "Cyklistika" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Horská turistika" + +#. 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 "Lýžovanie" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "vedľajšia koľaj (napr: na stanici)" + +#. 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 "Informačná tabuľa" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Typ tabuľe" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "tabuľa" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Hraničná kontrola" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "pre začiatočníkov" + +#: build/trans_presets.java:1737 msgid "history" msgstr "história" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "príroda" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "divoká príroda" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "využitie oblasti (landuse)" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Informačné miesto (Turistika) (Guidepost (Hiking))" -#. 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 "Informácia" + +#. 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 "Bližší popis" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Zvuk" + +#. +#: 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 "Telefónne číslo" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Ostatné(iné) informačné body(miesta)" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Upraviť prístrešok" @@ -16407,25 +17926,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 "Ohnisko" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Výletné miesto" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Upraviť výletné miesto" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historické miesta" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Hrad" @@ -16434,20 +17953,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Upraviť hrad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruiny" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Upraviť ruiny" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Archeologické nálezisko" @@ -16456,10 +17974,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Upraviť archeologické nálezisko" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Bojisko" @@ -16467,5 +17984,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Upraviť bojisko" @@ -16473,15 +17990,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Pamätihodnosť, pamätník" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Upraviť pamätihodnosť, pamätník" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Pomník" @@ -16489,45 +18006,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Upraviť pomník" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Kríž pri ceste" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Upraviť kríž pri ceste" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Božia muka" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Upraviť božiu muku" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Oddych (Leisure)" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Vodný zábavný park" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Upraviť vodný zábavný park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Ihrisko" @@ -16535,15 +18052,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Upraviť ihrisko" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Rybolov" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Upraviť rybolov" @@ -16551,15 +18068,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Športové zariadenie" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Štadión" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Upraviť štadión" @@ -16573,6 +18090,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 "vyberte šport:" @@ -16964,30 +18481,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 "šport" @@ -16997,68 +18514,68 @@ #. 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 "multi" -#: 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 "lukostreľba" -#: 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 "atletika" -#: 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 "australian_football" -#: 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 "bejzbal" -#: 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 "basketbal" -#: 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 "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)" -#: 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 "" "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)" -#: 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 "kanoe" -#: 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 "lezenie" -#: 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 "kriket" -#: 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 "" "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)" -#: 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 "" @@ -17066,162 +18583,160 @@ "trávnika)" -#: 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 "bicyklovanie" -#: 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 "závody chrtov" -#: 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 "jazdectvo" -#: 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 "americký futbal" -#: 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 "golf" -#: 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 "gymnastika" -#: 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 "hokej" -#: 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 "konské dostihy" -#: 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 "automobilový" -#: 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 "pelota" -#: 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 "racquetbal (podobné ako squash, iné pravidlá)" -#: 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 "ragby" -#: 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 "streľba" -#: 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 "skateboard" -#: 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 "korčuľovanie" -#: 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 "lyžovanie" -#: 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 "futbal (soccer)" -#: 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 "plávanie" -#: 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 "stolný tenis" -#: 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 "tenis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Športové centrum" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Upraviť športové centrum" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Hracia plocha, ihrisko" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Upraviť hraciu plochu, ihrisko" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Dostihová dráha" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Upraviť dostihovú dráhu" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfové ihrisko" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Upraviť golfové ihrisko" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Upraviť minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Šport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Multi" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Upraviť Multi" @@ -17260,248 +18775,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 "hracia plocha, ihrisko" -#: 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 "športové centrum" -#: 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 "štadión" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "10pin (Kolok na hru s desiatimi kolkami)" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletika" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Upraviť atletiku" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Lukostreľba" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Upraviť lukostreľbu" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Lezenie" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Upraviť lezenie" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kanoistika" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Upraviť kanoistiku" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Cyklistika" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Upraviť cyklistiku" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Preteky chrtov" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Upraviť preteky chrtov" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Jazdectvo" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Upraviť jazdectvo" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Konské dostihy" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Upraviť konské dostihy" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastika" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Upraviť turistiku" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motošport" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Upraviť motošport" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Korčuľovanie" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Upraviť korčuľovanie" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Upraviť Skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Plávanie" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Upraviť plávanie" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Lýžovanie" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Upraviť lyžovanie" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Typ lyžiarskej dráhy" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "zjazdárska" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "beh nalyžiach hore kopcom (nordic)" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "park zimných športov" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Obtiažnosť" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "pre začiatočníkov" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "ľahká" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "stredne pokročilý (intermediate)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "pokročilý (advanced)" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "pre skúsených" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "freeride (zjazd na horských bicykloch cez prekážky)" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Streľba" @@ -17509,178 +19016,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Upraviť streľbu" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Šport (loptový)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Futbal" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Upraviť futbal" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Americký futbal" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Upraviť americký futbal" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australian Football" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Upraviť Australian Football" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Bejzbal" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Upraviť bejzbal" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketbal" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Upraviť basketbal" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Upraviť golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golfové ihrisko" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Bowling na tráve" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Upraviť bowling na tráve" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowling" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Upraviť bowling" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Kriket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Upraviť kriket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cvičné ihrisko pre kriket so sieťou" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Upraviť cvičné ihrisko pre kriket so sieťou" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Upraviť kroquet" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hokej" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Upraviť hokej" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Upraviť polotu" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Racquetbal" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Upraviť racquetbal" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Ragby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Upraviť ragby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Stolný tenis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Upraviť stolný tenis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tenis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Upraviť tenis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Budovy, stavby" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Budova" @@ -17688,5 +19195,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Verejná budova" @@ -17694,10 +19201,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Upraviť verejnú budovu" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Radnica (obecný úrad)" @@ -17705,10 +19212,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Upraviť radnicu (obecný úrad)" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Veľvyslanectvo" @@ -17716,10 +19223,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Upraviť veľvyslanectvo" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Súd" @@ -17728,10 +19235,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Upraviť súd" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Vezenie" @@ -17740,10 +19247,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Upraviť súd" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Polícia" @@ -17753,10 +19260,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 "Upraviť políciu" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Hasičská stanica" @@ -17765,10 +19272,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Upraviť hasičskú stanicu" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Pošta" @@ -17776,5 +19283,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Upraviť poštu" @@ -17782,15 +19289,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Škôlka" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Upraviť škôlku" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Škola" @@ -17798,10 +19305,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Upraviť školu" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Univerzita" @@ -17809,10 +19316,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Upraviť Univerzitu" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Vysoká škola" @@ -17820,5 +19327,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Upraviť vysokú školu" @@ -17826,5 +19333,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kino" @@ -17833,10 +19340,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Upraviť kino" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Knižnica" @@ -17845,10 +19352,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Upraviť knižnicu" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Kultúrne stredisko" @@ -17856,10 +19362,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Upraviť kultúrne stredisko" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Divadlo" @@ -17868,10 +19374,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Upraviť divadlo" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Kostol" @@ -17881,5 +19387,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 "Upraviť kostol" @@ -17888,6 +19394,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 "Náboženstvo" @@ -17896,66 +19402,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 "baháisti" -#: 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 "budhisti" -#: 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 "kresťania" -#: 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 "hinduisti" -#: 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 "džinisti" -#: 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 "judaisti" -#: 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 "moslimovia" -#: 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 "sikh" -#: 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 "spiritualisti" -#: 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 "taoisti" -#: 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 "unitársky" -#: 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 "zoroastrian" -#: 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 "Vyznanie (cirkevné)" @@ -17964,81 +19470,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 "anglikánska" -#: 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 "baptistická" -#: 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 "katolícka" -#: 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 "evanjelikánska" -#: 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 "svedkovia jehovovi" -#: 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 "lutheránska" -#: 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 "methodistická" -#: 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 "mormónska" -#: 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 "orthodoxná" -#: 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 "pentecostal" -#: 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 "presbiteriánska" -#: 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 "protestanská" -#: 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 "quakerská" -#: 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 "šiítska" -#: 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 "sunnitská" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresy" @@ -18047,5 +19553,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Upraviť informácie o adrese" @@ -18053,5 +19559,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Číslo domu" @@ -18059,20 +19565,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Meno domu" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Názov mesta" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Poštové smerovacie číslo" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Kód krajiny" @@ -18080,5 +19586,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolácia adries" @@ -18087,5 +19593,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Upraviť interpoláciu adries" @@ -18093,71 +19599,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Schéma číslovania" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "nepárne" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "párne" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "všetky" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "abecedný" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Človekom vytvorené (Man made)" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Závody (továrne)" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Upraviť závody (továrne)" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Veža" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Upraviť vežu" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vodojem" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Upraviť vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Plynojem (Gasometer)" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Upraviť plynojem (gasometer)" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Maják" @@ -18165,10 +19667,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Upraviť maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Veterný mlyn" @@ -18176,10 +19678,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Upraviť veterný mlyn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Potrubie" @@ -18187,10 +19689,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Upraviť potrubie" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Čistička odpadových vôd" @@ -18200,10 +19702,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 "Upraviť čističku odpadových vôd" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Žeriav" @@ -18211,10 +19713,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Upraviť žeriav" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Signál (rádiomaják)" @@ -18222,10 +19724,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Upraviť signál (rádiomaják)" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Meračský bod" @@ -18233,10 +19735,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Upraviť meračský bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Pozorovanie (ostraha)" @@ -18244,5 +19746,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Upraviť pozorovaciu kameru" @@ -18250,5 +19752,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Elektráreň (spôsob vyroby)" @@ -18258,39 +19760,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 "Upraviť elektráreň (spôsob vyroby)" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "veterná" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vodná" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fosílna" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "jadrová" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "uhoľná" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "fotovoltanická (slnečná články)" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "plynová" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Transformátorová stanica" @@ -18299,10 +19801,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Upraviť trafostanicu" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Malý transformátor" @@ -18311,5 +19813,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Upraviť malý transformátor" @@ -18317,10 +19819,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 "Odkazová linka" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Elektrický stožiar (vysoké napätie)" @@ -18331,5 +19833,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 "Upraviť elektrický stožiar" @@ -18337,5 +19839,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Elektrické vedenie" @@ -18344,46 +19846,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Upraviť elektrické vedenie" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Napätie" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Počet vodičov" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Vybavenosť (Amenities)" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toalety" -#. 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 "Referenčné číslo" - #. 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 "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Poštová schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefón" @@ -18392,5 +19888,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Upraviť telefón" @@ -18398,5 +19894,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 "Mince" @@ -18404,5 +19900,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 "Bankovky" @@ -18410,5 +19906,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 "Platobné karty a Kreditné karty" @@ -18416,5 +19912,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 "Debetné karty" @@ -18422,15 +19918,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 "Kreditné karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefónne karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recyklácia" @@ -18439,5 +19935,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Upraviť recykláciu (zber)" @@ -18445,80 +19941,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batérie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Handry" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Železný šrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Lavička" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Poľovnícky posed" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Upraviť poľovnícky posed" -#. 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 "Výška" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "nízky" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "polovičný" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "úplný" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Skryť" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Zamknúť" -#. 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 "Výška" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "nízky" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "polovičný" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "úplný" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontána" @@ -18527,10 +20019,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Upraviť fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Pitná voda" @@ -18539,10 +20031,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Upraviť pitnú vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Hniezdo záchrany" @@ -18550,25 +20042,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Upraviť hniezdo záchrany" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Upraviť supermarket" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Chata" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Upraviť chatu" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Obchod s polotovarmi" @@ -18576,10 +20078,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Upraviť obchod s polotovarmi" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Stánok" @@ -18587,10 +20088,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Upraviť stánok" -#. 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 "Upraviť autobusovú zastávku" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Upraviť strom" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Predajný automat" @@ -18598,5 +20118,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Upraviť predajný automat" @@ -18604,88 +20124,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Predávané výrobky" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "lístky MHD" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "plány MHD" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parkovacie lístky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "jedlo" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "pitie" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "krmivo pre zvieratá" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telefónne kupóny (poukážky)" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "kupóny (poukážky)" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "kondómy" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Prístupové alebo vernostné karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Mäsiareň" @@ -18693,10 +20213,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Upraviť mäsiarstvo" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Chlieb a pečivo" @@ -18704,10 +20223,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Upraviť chlieb a pečivo" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Kvetinárstvo" @@ -18715,20 +20233,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Upraviť kvetinárstvo" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Biopotraviny" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Upraviť biopotraviny" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Alkohol" @@ -18736,60 +20252,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Upraviť Obchod s alkoholickými nápojmi" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Nápoje" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Upraviť Obchod s nápojmi." -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Počítač" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Upraviť počítačový obchod" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronika" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Upraviť obchod s elektronikou" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Upraviť obchod s Hifi elektronikou" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Nábytok" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Upraviť obchod s nábytkom" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Záhradné centrum" @@ -18797,10 +20307,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Upraviť záhradné centrum" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Železiarstvo" @@ -18808,10 +20317,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Upraviť železiarstvo" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Obchod Urob si sám" @@ -18819,60 +20327,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Upraviť obchod Urob si sám" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Papierníctvo" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Upraviť papierníctvo" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Kaderníctvo" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Upraviť kaderníctvo" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Obuva" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuvou" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Hračky" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Upraviť obchod s hračkami" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Obchod s DVD" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Upraviť obchod s DVD" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Chemická čistiareň" @@ -18880,10 +20382,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Upraviť chemickú čistiareň" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Práčovňa" @@ -18891,10 +20392,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Upraviť práčovňu" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Turistický (Outdoor)" @@ -18902,35 +20402,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Športy" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Upraviť športový obchod" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optik" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Upraviť očnú optiku" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Hotovosť" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banka" @@ -18938,16 +20435,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Upraviť banku" -#. 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 "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Zmenáreň" @@ -18955,5 +20450,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Upraviť zmenáreň" @@ -18961,15 +20456,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Upraviť bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Zdravie" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Lekári" @@ -18977,20 +20472,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Upraviť lekárov" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Zubný lekár" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Upraviť zubného lekára" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Lekáreň" @@ -18998,5 +20491,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Upraviť lekáreň" @@ -19004,10 +20497,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "výdaj na recepty" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Nemocnica" @@ -19015,10 +20507,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Upraviť nemocnicu" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Pohotovosť (Záchranná služba)" @@ -19027,5 +20519,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Upraviť pohotovosť (záchrannú službu)" @@ -19034,20 +20526,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Číslo bodu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Meno bodu(miesta)" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Telefónne číslo" #. 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 "(Použite medzinárodný kód, ako +12-345-67890)" @@ -19055,5 +20547,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 "Veterinár" @@ -19062,55 +20554,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Upraviť veterinárnu ambulanciu" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Upraviť kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Krajina (štát)" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Upraviť krajinu (štát)" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Stav" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Upraviť štát" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Oblasť (región)" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Upraviť oblasť (región)" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "kraj (okres)" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Upraviť kraj (okres)" @@ -19118,15 +20610,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Mesto (city)" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Upraviť mesto" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Mesto (town)" @@ -19134,10 +20626,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Upraviť mesto" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Štvrť" @@ -19145,25 +20637,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Upraviť štvrť" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Dedina" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Upraviť dedinu" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Malá dedina / osada / samota" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Upraviť malú dedinu" @@ -19171,5 +20663,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Oblasť (lokalita)" @@ -19177,10 +20669,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Upraviť oblasť (lokalitu)" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Ostrov" @@ -19188,11 +20680,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Upraviť Ostrov" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "vľavo" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Upraviť chatu" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Vstup do jaskyne" @@ -19200,10 +20705,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Upraviť vstup do jaskyne" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Vrchol" @@ -19211,10 +20716,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Upraviť vrchol kopca" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Ľadovec" @@ -19222,10 +20727,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Upraviť ľadovec" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Sopka" @@ -19233,70 +20738,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Upraviť sopku" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Štátna" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Upraviť štátne hranice" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administratívne" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Upraviť administratívne hranice" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Občianske" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Upraviť občiansku hranicu" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politická" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Upraviť politickú hranicu" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Národný park" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Využívanie oblasti (Land use)" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Strom" @@ -19305,15 +20810,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Upraviť strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanický názov" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Drevo" @@ -19322,5 +20827,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Upraviť Drevo" @@ -19328,17 +20833,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 "ihličnatý" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "zmiešaný" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Les" @@ -19347,14 +20852,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Upraviť les" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Prírodná rezervácia" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Upraviť prírodnú rezerváciu" @@ -19362,25 +20867,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Sutina" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Upraviť sutinu" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Krovie" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Upraviť krovie" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))" @@ -19388,5 +20893,5 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "" @@ -19394,5 +20899,5 @@ #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Vresovisko" @@ -19400,5 +20905,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Upraviť vresovisko" @@ -19406,5 +20911,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Farma" @@ -19413,45 +20918,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Upraviť farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Poľnohospodárska pôda" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Upraviť poľnohospodárske pôdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Lúka" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Upraviť lúku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vinica" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Upraviť vinicu" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Ťažobný priestor" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Upraviť ťažobný priestor" @@ -19459,25 +20964,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Záhrada" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Upraviť záhradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Tráva" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Upraviť trávnatú plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Obecná zeleň" @@ -19485,10 +20990,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Upraviť obecnú zeleň" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Spoločné, obecné" @@ -19496,20 +21001,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Upraviť spoločné, obecné" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Upraviť park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Rekreačná oblasť" @@ -19517,5 +21022,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Upraviť rekreačnú oblasť" @@ -19523,15 +21028,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Osídlená oblasť (Residential area)" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Upraviť osídlenú oblasť" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Cintorín (malý, blizko kostola)" @@ -19539,9 +21044,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Upraviť cintorín (malý, blizko kostola)" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cintorín" @@ -19549,39 +21054,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Upraviť cintorín" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Maloobchod" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Upraviť oblasť s maloobchodmi" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Obchodná (komerčná)" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Upraviť obchodnú (komerčnú) oblasť" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Priemysel" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Upraviť priemyselnú oblasť" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Železničný pozemok" @@ -19589,15 +21094,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Upraviť železničný pozemok" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Armáda" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Upraviť vojenskú oblasť" @@ -19605,55 +21110,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Stavebná oblasť" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Upraviť stavebnú oblasť" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Brownfield (opustený priemyselný objekt)" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Upraviť brownfield (opustený priemyselný objekt)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Skládka odpadov" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Upraviť skládku odpadov" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Lom" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Upraviť lom" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "multipolygón" @@ -19663,5 +21168,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 "Upraviť multipolygón" @@ -19670,10 +21175,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "obvodová časť (outer segment)" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "vnútorná časť (inner segment)" @@ -19681,5 +21186,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Prikázané smery jazdy (turn restriction)" @@ -19688,5 +21193,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Upraviť prikázané smery jazdy (turn restriction)" @@ -19694,34 +21199,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Obmedzenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "zákaz zabočenia vľavo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "zákaz zabočenia vpravo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "zákaz jazdy priamo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "zákaz otáčania sa" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "prikázané odbočenie vpravo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "prikázané odbočenie vľavo" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "zákaz odbočenia" @@ -19730,15 +21235,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "cez bod alebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "k ceste" @@ -19746,5 +21251,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Cesta (Route)" @@ -19753,5 +21258,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Upraviť Cestu (Route)" @@ -19759,5 +21264,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Typ Cesty (Route)" @@ -19829,5 +21334,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 @@ -19836,17 +21341,17 @@ msgstr "bicykel" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "cesta (vozovka)" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "trajekt (prievoz)" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "lyžovanie" @@ -19899,5 +21404,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 @@ -19906,13 +21411,13 @@ msgstr "pešia (foot)" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "turistika" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "električka" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "obchádzka" @@ -19926,10 +21431,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro (subway)" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Popis značky" @@ -19937,31 +21442,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Sieť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "Route state" -msgstr "" +msgstr "Štátna cesta" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "proposed" msgstr "plánovaný" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "náhradný" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "dočasný" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "spojenie" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Farba (hex)" @@ -19970,30 +21475,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "cestný úsek" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "predný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "zadný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "bod prerušenia" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "predný bod prerušenia" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "zadný bod prerušenia" @@ -20431,11 +21936,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 "zastaralý" @@ -20761,41 +22266,4 @@ msgid "motorroad" msgstr "cesta pre motorové vozidlá" - -#. 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 "ulica" #. color street @@ -22496,5 +23964,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 "osvetlená_voda (light_water)" @@ -23093,55 +24561,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23155,5 +24574,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 "cestovanie" @@ -23225,8 +24644,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 "historické" @@ -23297,8 +24716,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 "zelená" @@ -23312,5 +24731,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "lom" @@ -23324,5 +24743,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "skládka odpadov (landfill)" @@ -23344,5 +24763,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody" @@ -23356,5 +24775,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "les" @@ -23368,5 +24787,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "farmy" @@ -23389,5 +24808,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "maloobchody" @@ -23401,5 +24820,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "závody" @@ -23413,5 +24832,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "brownfield (opustený priemyselný objekt)" @@ -23425,5 +24844,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)" @@ -23437,5 +24856,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "železničný pozemok" @@ -23492,7 +24911,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 "armáda" @@ -23506,5 +24925,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cintorín (cemetery)" @@ -23517,5 +24936,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "vrchol (peak)" @@ -23530,5 +24949,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "ľadovec (glacier)" @@ -23542,5 +24961,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "sopka" @@ -23595,8 +25014,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 "prírodné (natural)" @@ -23610,5 +25029,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "oblasť pokrytá krovím" @@ -23622,20 +25041,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "vresovisko" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "drevo (wood)" - #. color water #. 1 @@ -23646,5 +25053,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "blato (mud)" @@ -23658,5 +25065,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "pláž (beach)" @@ -23734,8 +25141,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 "trasa (route)" @@ -23783,7 +25190,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 "hranica (boundary)" @@ -23925,10 +25332,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 "miesto" @@ -23976,6 +25392,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 "adresa" @@ -24272,15 +25688,172 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Vybrať Tableau d'Assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Upraviť pozíciu WMS vrstvy (iba rastrové obrázky)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." + +#~ msgid "Change {0} {1}" +#~ msgstr "Zmeniť {0} {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Zmazať {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Odstrániť člena relácie {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}" + +#~ msgid "nodes" +#~ msgstr "body" + +#~ msgid "ways" +#~ msgstr "cesty" + +#~ msgid "relations" +#~ msgstr "relácie" + +#~ msgid "changesets" +#~ msgstr "changesets" + +#~ msgid "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. " +#~ "Výnimka: {0}" + +#~ msgid "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. " +#~ "Výnimky boli: {0}" + +#~ msgid "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" +#~ msgstr "" +#~ "Varovanie: nemôžem setAlwaysOnTop(true) pre ConflictResolution Dialog. " +#~ "Výnimka: {0}" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "Chybný priebeh nahrávania zo servera. Detaily:
{0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "Nachádzajú sa neuložené zmeny vo vrstve''{0}''. Vymazať vrstvu určite?" + +#~ msgid "Delete Layer" +#~ msgstr "Vymazať vrstvu" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Naozaj chcete vymazať vrstvu ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Zmazať všetko" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Vymazávaná vrstva {0} z {1}" + +#~ msgid "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na " +#~ "vrchu. Výnimka bola: {0}" + +#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka " +#~ "bola: {0}" + +#~ msgid "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie dialógového okna prepínač vždy na vrchu. " +#~ "Výnimka bola: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autori(spracovatelia): {0}" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka " +#~ "bola: {0}" + +#~ msgid "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka " +#~ "bola: {0}" + +#~ msgid "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" +#~ msgstr "" +#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového " +#~ "limitu servera. Výnimka bola: {1}" + +#~ msgid "Public" +#~ msgstr "Verejné" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Zvoliť Lambert súradnice" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním." + +#~ msgid "Continue anyway" +#~ msgstr "Pokračovať akokoľvek" + +#~ msgid "Copy Default" +#~ msgstr "Skopírovať východzí" + +#~ msgid "Edit Information Office" +#~ msgstr "Upraviť informačnú kanceláriu" + +#~ msgid "Map Type" +#~ msgstr "Typ mapy" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "citymap" +#~ msgstr "mapa mesta" + +#~ msgid "hikingmap" +#~ msgstr "turistická mapa" + +#~ msgid "bicyclemap" +#~ msgstr "cykloturistická mapa" + +#~ msgid "Board Type" +#~ msgstr "Typ tabuľe" + +#~ msgid "board" +#~ msgstr "tabuľa" #~ msgid "Move" #~ msgstr "Presunúť" - -#~ msgid "Not implemented yet." -#~ msgstr "Zatiaľ nie je implementované." #~ msgid "Email" @@ -24590,4 +26163,7 @@ #~ "{0}" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Vybrať Tableau d'Assemblage" + #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -24791,7 +26367,4 @@ #~ msgstr "Aktualizácia neúspešná" -#~ msgid "Failed to update the selected primitives." -#~ msgstr "Chyba pri aktualizácii vybraných pôvodných." - #~ msgid "" #~ "The OSM primitive with id {0} has been " @@ -24831,4 +26404,7 @@ #~ msgstr "Chyba počas komunikácie so serverom" +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Upraviť pozíciu WMS vrstvy (iba rastrové obrázky)" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Neúspešná inicializácia API. Prosím skúste to znova pozdejšie ." @@ -24836,7 +26412,4 @@ #~ msgid "API initialization failed" #~ msgstr "API inicializácia neúspešná" - -#~ msgid "image loading..." -#~ msgstr "nahrávam obrázok..." #~ msgid "WGS84 Geographisch" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 17484) +++ /applications/editors/josm/i18n/po/sl.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 13:40+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:22+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,77 +17,80 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Priprava grafičnega uporabniškega vmesnika" #. 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 "Pomoč" -#: ../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 "" -#: ../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 @@ -97,155 +100,161 @@ #: ../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 "Napaka" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Namig: Do nekaterih sprememb je prišlo zaradi pošiljanja podatkov na " -"strežnik." - -#: ../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] "Nekaj sprememb ni shranjenih." +msgstr[1] "Nekaj sprememb ni shranjenih." +msgstr[2] "Nekaj sprememb ni shranjenih." +msgstr[3] "Nekaj sprememb ni shranjenih." + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Neshranjene spremembe" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Nekaj sprememb ni shranjenih." - -#: ../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 "Shrani in končaj" -#: ../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 "Zavrzi in končaj" -#: ../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 "Prekliči" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../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 "Pozor" -#: ../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 "" + +#: ../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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" @@ -271,7 +280,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 +319,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 +341,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 "Vstavki" @@ -347,13 +357,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -362,5 +379,5 @@ msgstr "" -#: ../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 "" @@ -370,11 +387,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -383,5 +400,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 "" @@ -398,11 +415,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 @@ -431,5 +448,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 "Z. širina" @@ -438,30 +455,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 "Z. dolžina" +#: ../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 "Razporedi vozliša v krog" -#: ../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 "Premakne izbrana vozlišča tako, da tvorijo krog." -#: ../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 @@ -475,6 +492,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 @@ -482,58 +499,57 @@ msgstr "Orodje: {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 "Prosim, izberite vsaj 4 vozlišča." #. 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 "Informacije" #. 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 "Poravnaj vozlišča na premico" -#: ../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 "Premakne izbrana vozlišča tako, da so na isti premici." -#: ../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 "Prosim, izberite vsaj 3 vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -542,10 +558,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -554,5 +570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -561,46 +577,46 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "podatke" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "plast" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "izbor" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "sprejem" +#: ../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 "Povečava na {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 "Povečava pogleda na {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 @@ -610,22 +626,22 @@ msgstr "Pogled: {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 "Združi poti" -#: ../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 "Združi več poti v eno samo." -#: ../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 "" @@ -636,4 +652,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 " @@ -641,13 +661,13 @@ msgstr "" -#: ../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 "Obrnem smeri?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +msgid "Reverse and Combine" +msgstr "Obrni in združi" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -655,31 +675,26 @@ msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Obrni in združi" - -#: ../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: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 "Razreši neskladja" -#: ../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 "Združi {0} poti" -#: ../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 "Vse poti so bile prazne" -#: ../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 " @@ -687,32 +702,32 @@ msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)" +#: ../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 "Kopiraj" -#: ../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 "Kopiraj izbrane predmete v odložišče" -#: ../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 "Izberite predmete, ki jih želite kopirati." +#: ../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 "Ustvari krog" -#: ../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 "Skozi izbrana tri vozlišča ustvari krog" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -722,20 +737,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 "Izbriši" @@ -745,85 +760,86 @@ msgstr "Izbriši izbrane predmete." -#: ../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 "Prepiši" -#: ../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 "Datoteka obstaja. Jo nadomestim?" #. 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 "Sprejem iz 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 "Sprejmi podatke zemljevida s strežnika 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 "Datoteka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Sprejemanje" -#: ../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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -832,6 +848,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 "Podvoji" @@ -855,85 +871,91 @@ msgstr "Zaključek dela z aplikacijo." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Vse slike" + +#: ../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 "Izvoz v 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 "Izvoz v datoteko oblike 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 "" -#: ../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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Spletna pomoč programa 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 "Odpri v brskalniku" -#: ../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 "Uredi" -#: ../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 "Ponovno naloži" -#: ../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 "" -#: ../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 "Napaka pri nalaganju strani {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." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -985,22 +1007,26 @@ 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 "Združi vozlišča" -#: ../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 "Združi vozlišča v najstarejšega" -#: ../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 "Izberite vsaj dve vozlišči za združitev" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 +msgid "Merge nodes with different memberships?" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge nodes with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +msgid "Merge Anyway" +msgstr "Vseeno združi" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1008,77 +1034,73 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Vseeno združi" - -#: ../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 "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi." -#: ../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 "Združi {0} vozlišč" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Zrcali" -#: ../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 "Prezrcali izbrana vozlišča in poti" -#: ../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 "Prosim, izberize vsaj eno vozlišče ali pot." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "gor" -#: ../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 "Premakni predmete {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "dol" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "levo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "desno" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Premakni {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 "Premakni predmete {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 "Predmetov ni možno prestaviti s tega sveta." @@ -1086,5 +1108,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 "Nova" @@ -1094,17 +1116,22 @@ msgstr "Ustvari nov zemljevid." -#: ../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 "Odpri ..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Odpri datoteko." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Odpri datoteko." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Neznana vloga ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1142,21 +1169,17 @@ msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj" -#: ../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 "" -#: ../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 " @@ -1165,9 +1188,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 "Izbrano je le eno vozlišče" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "" @@ -1183,13 +1206,30 @@ msgstr "Prilepi vsebino odložišča" -#: ../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 "Prilepi oznake" -#: ../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 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1215,37 +1255,32 @@ msgstr "Znova uveljavi zadnje razveljavljeno dejanje." -#: ../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 "Preimenuj plast" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Hkrati preimenuj datoteko" -#: ../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 "" +#: ../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 "Obrni poti" -#: ../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 "Obrni smer izbranih poti." -#: ../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 "Izberite vsaj eno pot" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Obrni smer poti" @@ -1253,10 +1288,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 "Shrani" #: ../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 "Shrani trenutne podatke" @@ -1267,35 +1303,25 @@ msgstr "Datoteka {0} že obstaja. Jo prepišem?" -#: ../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 "Dokument ni odprt, zato ni kaj shraniti." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Prazen dokument" -#: ../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 "Dokument ne vsebuje podatkov." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Vseeno shrani" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "V sporu z" -#: ../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 " @@ -1303,28 +1329,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Zavrži spremembe in shrani" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Shrani datoteko OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Shrani datoteko 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 "Shrani kot..." -#: ../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 "Shrani trenutne podatke v novo datoteko" @@ -1356,33 +1382,33 @@ msgstr "Pomoč: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Poročilo stanja" -#: ../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 "Kopiraj na odložišče in zapri" -#: ../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 "Zapri" +#: ../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 "Razdeli pot" -#: ../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 "Razdeli pot pri izbranem vozlišču." -#: ../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." @@ -1392,5 +1418,5 @@ msgstr[3] "Izbrana vozlišča niso na sredini nobene poti." -#: ../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 " @@ -1404,9 +1430,9 @@ msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." -#: ../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 "Izbrana vozlišča niso del iste poti." -#: ../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." @@ -1416,10 +1442,10 @@ msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč." -#: ../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 "Za razdelitev krožne poti izberite dve ali več vozlišč." -#: ../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 " @@ -1429,5 +1455,5 @@ "sredini poti.)" -#: ../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 " @@ -1435,5 +1461,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 " @@ -1441,8 +1467,32 @@ 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 "Razdeli pot {0} na {1} delov" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +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 "Shrani trenutne podatke" + +#: ../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 "paket sprememb" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "paket sprememb" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1460,56 +1510,56 @@ msgstr "" +#: ../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 "Izberite bodisi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Eno vozlišče z oznakami" -#: ../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 "* Eno vozlišče, ki je del več poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali" -#: ../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." msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti." -#: ../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" @@ -1519,9 +1569,9 @@ msgstr "" -#: ../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" @@ -1529,5 +1579,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" @@ -1571,61 +1621,71 @@ msgstr "Posodobitev trenutne podatkovne plasti (ponoven sprejem s strežnika)" -#: ../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 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Posodobi izbor" -#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Izbor je prazen" -#: ../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 "Pošlji v 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 "Pošlji vse spremembe na strežnik 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 "Obstajajo nerazrešeni konflikti. Razrešite jih." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Obstajajo nerazrešeni konflikti. Razrešite jih." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Ni sprememb za pošiljanje." -#: ../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 "" -#: ../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 "" @@ -1639,17 +1699,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1660,32 +1720,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Pošljem te spremembe?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Dodaj novo vozlišče v pot" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1693,31 +1791,86 @@ 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 "Vpišite kratek opis sprememb, ki jih pošiljate:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Nastavitve zemljevida" + +#: ../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 "paket sprememb" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Novi predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Spremenjeni predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Izbrisani predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Pošljem te spremembe?" - -#: ../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 "Pošiljanje" +#: ../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] "Novi predmeti:" +msgstr[1] "Novi predmeti:" +msgstr[2] "Novi predmeti:" +msgstr[3] "Novi predmeti:" + +#: ../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] "Spremenjeni predmeti:" +msgstr[1] "Spremenjeni predmeti:" +msgstr[2] "Spremenjeni predmeti:" +msgstr[3] "Spremenjeni predmeti:" + +#: ../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] "Izbrisani predmeti:" +msgstr[1] "Izbrisani predmeti:" +msgstr[2] "Izbrisani predmeti:" +msgstr[3] "Izbrisani predmeti:" + +#: ../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 "Zadnja sprememba {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1741,20 +1894,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 "Zvok: {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 "Hitreje" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Hitreje naprej" @@ -1796,10 +1949,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 "Počasneje" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Počasneje naprej" @@ -1827,31 +1980,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 "Nič podatkov ni bilo uvoženih." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Podatki 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 "Sprejem {0} od {1} (še {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 "Napake pri sprejemu" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1863,20 +2012,20 @@ msgstr "" -#: ../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 "Način za brisanje" -#: ../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 "Izbriši vozlišča ali poti" -#: ../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 @@ -1885,5 +2034,5 @@ msgstr "Način: {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 " @@ -1891,55 +2040,69 @@ msgstr "" -#: ../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 "parameter ''{0}'' ne sme biti ničen" +#: ../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 "Nariši" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Nariši vozlišča" -#: ../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 @@ -1947,38 +2110,38 @@ msgstr "izbrano" -#: ../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 "Ni mogoče dodati vozlišča izven tega sveta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Dodaj vozlišče" -#: ../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 "Dodaj vozlišče v pot" -#: ../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 "Poveži obstoječo pot z vozliščem" -#: ../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 "Dodaj novo vozlišče v pot" -#: ../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 "Dodaj in poveži vozlišče v pot" -#: ../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 "Ustvari novo vozlišče." -#: ../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 "Izberi vozlišče pod kazalcem miške." -#: ../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." @@ -1989,14 +2152,14 @@ msgstr[3] "Vstavi novo vozlišče v {0} poti." -#: ../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 "Začni novo pot od zadnjega vozlišča" -#: ../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 "Nadaljuj pot od zadnjega vozlišča." -#: ../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 "Zaključi risanje." @@ -2016,5 +2179,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 "Za izbor predmetov v pravokotniku izpustite miškin gumb." @@ -2025,5 +2188,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 "Za prenehanje vrtenja izpustite miškin gumb." @@ -2039,17 +2202,18 @@ msgstr "" +#: ../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 "Izberite" -#: ../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 "Izberi, premakni ali zasuči predmete" -#: ../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" @@ -2058,13 +2222,21 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Premakni elemente" -#: ../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 "Premakni jih" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Razveljavi premik" + +#: ../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 "" @@ -2073,13 +2245,9 @@ "Naj jih zares premaknem?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Premakni jih" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Razveljavi premik" - -#: ../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." @@ -2088,5 +2256,5 @@ "najbližjo točko." -#: ../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-" @@ -2109,60 +2277,60 @@ msgstr "" +#: ../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 "Išči..." -#: ../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 "Iskanje predmetov." -#: ../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 "Prosim, vnesite iskalni izraz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "nadomesti izbor" -#: ../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 "dodaj v izbor" -#: ../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 "odstrani iz izbora" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "upoštevaj velikost črk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regularni izraz" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2170,109 +2338,109 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" +msgid "modified - all changed objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Začni iskanje" -#: ../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 "" -#: ../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 "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../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 "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../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 "Najdeno {0} zadetkov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "" @@ -2333,58 +2501,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Naloži izbrano" -#: ../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 "Kontaktiraj {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Sprejemanje..." -#: ../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 "Ni mogoče brati z naslova: \"{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 "Napaka pri razločevanju na naslovu: \"{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 "Dodaj vozlišče" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Dodaj {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 "relacije" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Spremeni {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 "Spremeni {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Spremeni relacijo" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Odstrani \"{0}\" pri {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Odstrani \"{0}\" pri {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 "Odstrani \"{0}\" pri {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Nastavi {0}={1} pri {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 "Nastavi {0}={1} pri {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Nastavi {0}={1} pri {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" @@ -2395,10 +2601,10 @@ msgstr[3] "predmeti" -#: ../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 "Odstrani \"{0}\" pri {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}" @@ -2410,5 +2616,5 @@ msgstr "Spremeni vlogo člana relacije pri {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2417,10 +2623,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2429,5 +2635,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}''" @@ -2451,42 +2657,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Izbriši {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Izbriši {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] "Izbriši {0} {1}" +msgstr[1] "Izbriši {0} {1}" +msgstr[2] "Izbriši {0} {1}" +msgstr[3] "Izbriši {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] "Način za brisanje" +msgstr[1] "Način za brisanje" +msgstr[2] "Način za brisanje" +msgstr[3] "Način za brisanje" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Izbriši {0} {1}" +msgstr[1] "Izbriši {0} {1}" +msgstr[2] "Izbriši {0} {1}" +msgstr[3] "Izbriši {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] "Izbriši izbrano relacijo" +msgstr[1] "Izbriši izbrano relacijo" +msgstr[2] "Izbriši izbrano relacijo" +msgstr[3] "Izbriši izbrano relacijo" + +#: ../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 "" "Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n" "Izbrišem iz relacije?" -#: ../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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" +msgstr "" +"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n" +"Izbrišem iz relacije?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "" @@ -2494,6 +2726,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." @@ -2502,5 +2734,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2511,5 +2743,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2544,10 +2776,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2560,18 +2802,38 @@ msgstr "Zaporedje" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Razreši {0} sporov v {1} predmetih" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Razreši {0} sporov v {1} predmetih" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Razreši {0} sporov v {1} predmetih" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Razreši {0} sporov v {1} predmetih" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Razreši {0} sporov v {1} predmetih" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Razreši {0} sporov v {1} predmetih" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2595,13 +2857,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relacija" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Stara vloga" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nova vloga" @@ -2620,62 +2882,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 "Nova vrednost" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Uveljavi izbrane spremembe" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Ne uveljavi sprememb" -#: ../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 "Lastnosti " -#: ../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 "Samodejno popravljanje oznak" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Ni možno odpreti imenika z nastavitvami: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../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 +#, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" + +#: ../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 "Nastavitve shranjene na {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 "Nastavitev ni bilo mogoče prenesti. Razlog: {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 "" @@ -2689,29 +3008,36 @@ msgstr "" -#: ../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 "Decimalne stopinje" -#: ../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 "Stopinje Minute Sekunde" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "J" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "Z" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "V" -#: ../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}" @@ -2723,15 +3049,229 @@ msgstr "" -#: ../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 "nepopoln" - -#: ../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 "Napaka: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Opozorilo: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "Neznana vloga ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../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 "besedilo" + +#. 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 "" + +#: ../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" @@ -2742,22 +3282,7 @@ msgstr[3] "vozlišča" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Napaka: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Opozorilo: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "vozlišča" - -#: ../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" @@ -2768,12 +3293,7 @@ msgstr[3] "poti" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "poti" - -#: ../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" @@ -2784,27 +3304,130 @@ msgstr[3] "relacije" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relacije" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "paket sprememb" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "paketi sprememb" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../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 "nepopolna pot" + +#: ../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 "ozadje" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 +msgid "Mercator" +msgstr "Merkator" + +#: ../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 "" + +#: ../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 from
''{0}''
Error was: {1}" +msgstr "" + +#: ../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 "Ne prikaži več" + +#: ../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 "" + +#: ../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 "nepopoln" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "cesta" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "železnica" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vodotok" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "raba tal" + +#: ../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} točk" +msgstr[1] "{0} točka" +msgstr[2] "{0} točki" +msgstr[3] "{0} točke" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 #, java-format msgid "{0} member" @@ -2815,309 +3438,50 @@ msgstr[3] "{0} člani" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "cesta" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "železnica" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vodotok" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "raba tal" - -#: ../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} točk" -msgstr[1] "{0} točka" -msgstr[2] "{0} točki" -msgstr[3] "{0} točke" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "Neznana vloga ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../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 "besedilo" - -#. 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 "" - -#: ../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 "nepopolna pot" - -#: ../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 "ozadje" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 -msgid "Mercator" -msgstr "Merkator" - -#: ../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 "" - -#: ../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 "Ne prikaži več" - -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "neznan" + +#: ../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 "" @@ -3127,36 +3491,9 @@ msgstr "" -#: ../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 "neznan" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3166,9 +3503,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 "" @@ -3177,9 +3514,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3188,9 +3525,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 "" @@ -3200,9 +3548,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Neznan gostitelj" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3212,11 +3560,6 @@ msgstr "" -#: ../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 "" @@ -3234,38 +3577,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 "Pošiljanje nastavitev" -#: ../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 "Prenos trenutnih nastavitev na strežnik" -#: ../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 "Ime uporabnika." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Geslo za dostop do 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 "" -#: ../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 " @@ -3273,5 +3616,5 @@ msgstr "" -#: ../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 " @@ -3279,5 +3622,5 @@ msgstr "" -#: ../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 " @@ -3285,75 +3628,94 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "katerikoli" -#: ../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 "Uporabniško ime" -#: ../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 "Geslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "uporaba" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Prikaži to pomoč" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Sprejmi pravokotno področje" -#: ../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 "" -#: ../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 "Odpri datoteko (če .gpx, potem kot surov GPS)" -#: ../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 "Sprejmi pravokotno področje GPS podatkov" -#: ../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 "Ponastavi nastavitve na privzete" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Nastavi jezik." -#: ../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 "primeri" -#: ../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" @@ -3361,47 +3723,47 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Aktiviranje posodobljenih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Nalaganje zgodnjih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Privzete nastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Nalaganje vstavkov" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Orodja" -#: ../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 "Prednastavitve" -#: ../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 @@ -3413,21 +3775,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 "Celozaslonski način" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Preklop celozaslonskega načina" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Zvok" @@ -3467,58 +3829,44 @@ msgstr "Pomanjšaj" -#: ../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 "Geografska dolžina pod kazalcem miške." -#: ../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 "Ime predmeta pod kazalcem miške." -#: ../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 "Geografska širina pod kazalcem miške." +#: ../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:98 +msgid "The (compass) heading of the line segment being drawn." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(ni predmeta)" -#: ../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 "plasti ni na seznamu." -#: ../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 "" - -#: ../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 "" @@ -3530,10 +3878,4 @@ msgid "File not found" msgstr "Datoteke ni mogoče najti" - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3592,7 +3934,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" @@ -3608,5 +3949,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" @@ -3709,5 +4050,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 "" @@ -3718,5 +4059,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" @@ -3730,5 +4071,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 "" @@ -3803,6 +4144,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" @@ -3912,10 +4253,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 "" @@ -3924,19 +4265,19 @@ msgstr "" -#: ../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 "" @@ -3945,5 +4286,5 @@ msgstr "" -#: ../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 "" @@ -3961,9 +4302,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 " @@ -3971,110 +4312,112 @@ 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 "izbrisano" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4083,21 +4426,21 @@ msgstr "" -#: ../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 "Vloga" #: ../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 "" @@ -4136,10 +4479,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 @@ -4148,10 +4492,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 @@ -4165,5 +4510,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}" @@ -4204,4 +4549,140 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "brez" + +#: ../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 "Izberite barvo" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parameter ''{0}'' ne sme biti ničen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Še ni podprto." + +#: ../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 +msgid "Tags from ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Spremeni relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +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] "" +msgstr[1] "" + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Odpravljanje sporov" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Razreši neskladja" + +#: ../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 "Prilepi" + +#: ../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} točk" +msgstr[1] "{0} točka" +msgstr[2] "{0} točki" +msgstr[3] "{0} točke" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4217,10 +4698,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 @@ -4228,5 +4709,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}" @@ -4257,36 +4738,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 "" @@ -4298,150 +4773,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 "Zgodovina" -#: ../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 "Prikaži zgodovino izbranih predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Zemljevid: {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 "Relacija" + +#: ../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 "" - -#: ../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 "Plasti" -#: ../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 "Odpri seznam vseh naloženih plasti." -#: ../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 "Izbriši izbrano plast." -#: ../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 "" - -#: ../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 "Prikaži/skrij" -#: ../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 "Preklopi vidljivost izbrane plasti." -#: ../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 "Pomakni izbrano plast vrstico višje." -#: ../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 "Pomakni izbrano plast vrstico nižje." -#: ../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." @@ -4452,28 +4895,22 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../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 "Prazna vrednost izbriše ključ" -#: ../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 "Sprememba vrednosti?" -#: ../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" @@ -4484,89 +4921,84 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../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 "Izberite ključ" -#: ../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 "Izberite vrednost" -#: ../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 "Lastnosti/Članstva" -#: ../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 "Lastnosti izbranih predmetov" #. 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 "Dodaj" -#: ../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 "Dodaj nov par ključ/vrednost vsem predmetom." -#: ../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 "Spremeni vrednost izbranega ključa vsem predmetom." -#: ../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 "Latnosti: {0} / Članstva: {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 "Lastnosti / Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Spremeni relacijo" -#: ../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 "Naj res izbrišem izbor iz relacije {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 "Izbriši izbrani ključ vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "" @@ -4575,34 +5007,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 "Relacije" -#: ../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 "Odpri seznam vseh relacij." -#: ../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 "" -#: ../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 "Odpri urejevalnik za izbrano relacijo" -#: ../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 "Izbriši izbrano relacijo" -#: ../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 "Ustvari novo relacijo" -#: ../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 "" @@ -4635,23 +5067,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 "Izbor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4659,78 +5077,106 @@ msgstr "" -#: ../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." msgstr "" -#: ../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 "Avtorji" -#: ../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 "Odpri seznam ljudi, ki delajo na izbranih predmetih." -#: ../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] "Avtor" +msgstr[1] "Avtor" +msgstr[2] "Avtor" +msgstr[3] "Avtor" + +#: ../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 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "Avtor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "Št. predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "" - -#: ../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 "" @@ -4739,47 +5185,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 " @@ -4788,14 +5228,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 "" @@ -4805,9 +5245,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 "" @@ -4817,15 +5257,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4833,5 +5273,5 @@ msgstr "" -#: ../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 " @@ -4839,20 +5279,20 @@ msgstr "" -#: ../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 "" @@ -4861,57 +5301,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 "Pomakni izbranega člana vrstico višje." #. 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 "Pomakni izbranega člana vrstico nižje." #. 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 " @@ -4920,9 +5360,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 "" @@ -4931,20 +5371,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 @@ -4954,37 +5390,37 @@ msgstr "V redu" -#: ../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 "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../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 "" @@ -4994,30 +5430,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 "" @@ -5031,22 +5467,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 "Nalaganje zgodnjih vstavkov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5079,34 +5520,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Zaznamki" -#: ../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 "Prosim, vnesite želene koordinate." -#: ../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 "Prosim, vnesite ime kraja." -#: ../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 "Najprej izberite zaznamek." @@ -5162,13 +5590,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 "Prosim, vpišite iskani niz" -#: ../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 "Rezultata iskanja kraja se ne da prebrati s strežnika" @@ -5176,18 +5604,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 "Vnesite ime kraja, ki ga želite poiskati:" -#. 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 "Kraji" #. 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 "" @@ -5226,37 +5653,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 "vrsta" -#: ../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 "blizu" -#: ../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 "povečava" -#: ../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: " @@ -5265,5 +5692,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 "" @@ -5290,46 +5717,74 @@ msgstr "Številke ploščic" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Prenos trenutnih nastavitev na strežnik" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5648,14 +6103,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5831,8 +6300,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" #. @@ -5929,4 +6404,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6040,6 +6518,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 @@ -6047,153 +6525,170 @@ #: 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 "Naziv" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "paket sprememb" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +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 "Zadnja sprememba {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6202,32 +6697,290 @@ msgstr "" -#: ../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 "Ime ceste" + +#: ../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 "Izberite vrednost" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parameter ''{0}'' ne sme biti ničen" + +#: ../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] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" +msgstr[3] "" + +#: ../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] "" +msgstr[3] "" + +#: ../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 "Zavrzi in končaj" + +#: ../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 "Shrani in končaj" + +#: ../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 "Plast" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +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 "Datoteka" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Pošiljanje" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "" -#: ../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 "Točka {0} x {1} nima časovne oznake" -#: ../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 "Ni mogoče razbrati časa \"{0}\" točke {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 "Ni moč najti slik z berljivo časovno oznako." -#: ../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 @@ -6235,29 +6988,29 @@ msgstr "Berem {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 "Slike z geografskim položajem" -#: ../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 "Začetek GPS sledi: {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 "Konec GPS sledi: {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 "trenutna razlika: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "razlika časovnih pasov: " -#: ../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" @@ -6268,14 +7021,14 @@ msgstr[3] "slike" -#: ../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} znotraj sledi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Uskladi uro" -#: ../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 @@ -6283,82 +7036,82 @@ msgstr "Slike 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 "Datuma v datoteki \"{0}\" ni bilo možno razbrati." -#: ../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 "V datoteki \"{0}\" manjka EXIF čas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Slika" -#: ../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 "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" -#: ../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 "" -#: ../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 "Uskladite čas z GPS napravo" -#: ../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 "Vpisanega časa ni bilo mogoče razpoznati." -#: ../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 "točka 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 "Riši povezave med točkami na tej plasti." #: ../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 "Riši povezave med točkami na tej plasti." - -#: ../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 "Ne riši povezav med točkami na tej plasti." -#: ../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 "Prilagodi barvo" -#: ../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 "Privzeto" -#: ../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" @@ -6418,5 +7171,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}" @@ -6432,10 +7185,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 "Pretvori v podatkovno plast" #: ../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." @@ -6444,11 +7197,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 @@ -6490,4 +7243,9 @@ "nadaljevati?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Sprejem podatkov" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6506,64 +7264,64 @@ msgstr "" -#: ../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 "" -#: ../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 "izven sprejetega področja" -#: ../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 "" -#: ../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 "" -#: ../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} je sestavljen iz:" -#: ../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} izbrisan.)" -#: ../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 "" -#: ../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 "Pretvori v plast 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" @@ -6573,5 +7331,5 @@ msgstr[3] "sledi" -#: ../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" @@ -6581,5 +7339,5 @@ msgstr[3] "točke" -#: ../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" @@ -6590,5 +7348,5 @@ msgstr[3] "sled z {0} točkami" -#: ../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" @@ -6597,5 +7355,5 @@ msgstr[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" @@ -6606,9 +7364,9 @@ msgstr[3] "{0} točke" -#: ../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 "" -#: ../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" @@ -6616,5 +7374,5 @@ msgstr[1] "" -#: ../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" @@ -6633,5 +7391,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}." @@ -6639,5 +7397,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 "" @@ -6665,5 +7423,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 " @@ -6671,5 +7429,5 @@ msgstr "" -#: ../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 " @@ -6677,29 +7435,29 @@ msgstr "" -#: ../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:43 +msgid "There was an error while trying to display the URL for this marker" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "There was an error while trying to display the URL for this marker" +msgid "(URL was: " msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 -msgid "(URL was: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Napredne nastavitve" -#: ../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 @@ -6707,26 +7465,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 "Trenutna vrednost je privzeta" -#: ../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 "Privzeta vrednost je ''{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 "Prosim izberite vrstico za urejanje." -#: ../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 @@ -6734,14 +7492,14 @@ msgstr "Nova vrednost za {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 "Prosim izberite vrstico za izbris." -#: ../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 "Vpišite nov par ključ/vrednost" @@ -6864,40 +7622,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 "Barva" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Izberite" -#: ../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 "Izberite barvo za {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 "Barve različnih predmetov v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Barve" @@ -6941,5 +7699,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Avtomobil" @@ -6961,16 +7719,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 "Kolo" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7000,12 +7759,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 "" @@ -7178,5 +7937,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 "" @@ -7184,23 +7943,32 @@ #. 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 "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +msgid "Show localized name in selection lists" +msgstr "" + +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +msgid "Show localized name in selection lists, if available" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Videz in občutek" @@ -7232,54 +8000,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 "Nastavi razpoložljive vstavke." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Sprejmi seznam" -#: ../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 "Posodobi" -#: ../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:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 +msgid "Add JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Nastavi vire vstavkov" #. 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 "Nastavitve prikaza" -#: ../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 " @@ -7287,41 +8055,41 @@ msgstr "Različne nastavitve, ki vplivajo na izgled celotne aplikacije." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Nastavitve povezave" -#: ../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 "Nastavitve povezave do strežnika 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 "Nastavitve zemljevida" -#: ../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 "Nastavitve zvoka" -#: ../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 "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati 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 "Oblika prikaza koordinat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Geografska projekcija" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "" @@ -7354,12 +8122,4 @@ msgid "Proxy server password" msgstr "Geslo na posredovalnem strežniku" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Osnovni URL naslov strežnika" #. 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 @@ -7386,61 +8146,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Izbriši izbrani vir iz seznama." -#: ../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 "" @@ -7606,36 +8365,59 @@ 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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Dodaj vozlišče v pot" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Izbriši izbrano plast." + +#: ../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 "Uporabi prednastavitev ''{0}'' iz skupine ''{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 "Uporabi prednastavitev ''{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 "" -#: ../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 @@ -7643,15 +8425,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {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 "" -#: ../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 "" -#: ../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 @@ -7663,22 +8445,22 @@ msgstr[3] "Spremeni {0} predmete" -#: ../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 "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Spremeni lastnosti" -#: ../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}''" @@ -7717,11 +8499,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 "Ni bilo možno prebrati \"{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 " @@ -7731,38 +8513,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 "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "Opis GPS sledi" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Dodaj podatke o avtorstvu" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Resnično ime" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "E-poštni naslov" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Avtorske pravice (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Preddoločen" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Leto avtorskih pravic" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Ključne besede" @@ -7772,9 +8554,9 @@ msgstr "Možnosti izvoza" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Izvozi in shrani" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7785,10 +8567,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 "Izberite preddoločeno licenco" -#: ../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 @@ -7798,12 +8580,12 @@ msgstr "" -#: ../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 "" -#: ../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" @@ -7824,6 +8606,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 @@ -7833,20 +8615,40 @@ msgstr "Sprejemanje podatkov 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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7854,34 +8656,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "" -#: ../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:43 +msgid "Malformed sentences: " +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 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 "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "" @@ -7892,9 +8694,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7903,15 +8705,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7919,33 +8721,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." +msgstr "Pripravljam podatke..." + +#: ../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 +#, java-format +msgid "Reusing existing changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "paket sprememb" + +#: ../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 "Zadnja sprememba {0}" + +#: ../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 "Kontaktiraj {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, 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 "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Pošiljanje ..." -#: ../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}." @@ -7973,42 +8833,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Napačno uporabniško ime ali geslo." -#: ../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 "Pozor: Geslo se prenaša nekriptirano" -#: ../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 "Shrani uporabniško ime in geslo (nekriptirano)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Vnesite geslo" -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Osnovni URL naslov strežnika" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM geslo" -#: ../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." @@ -8017,20 +8885,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8039,5 +8907,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8232,35 +9100,46 @@ "internetom." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - -#: ../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:104 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "" + +#: ../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 "Ni česa poslati. Najprej pridobite kakšne podatke." + +#: ../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 "Posodobitev vstavkov" -#: ../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 "" @@ -8273,5 +9152,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." @@ -8280,23 +9159,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8307,30 +9186,30 @@ msgstr "V vstavku {0} je prišlo do napake" -#: ../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 "" -#: ../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 "" -#: ../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 "Vstavka {0} ni bilo mogoče najti." -#: ../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 "Zadnja posodobitev vstavkov pred več kot {0} dnevi." -#: ../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 " @@ -8340,21 +9219,21 @@ "možnosti 'pluginmanager.warntime' v nastavitvah.)" -#: ../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 "Onemogoči vstavek" -#: ../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 "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?" -#: ../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 " @@ -8364,5 +9243,5 @@ "prepisati obstoječe datoteke." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8371,10 +9250,10 @@ "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{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 "Glede na podatke znotraj vstavka je avtor {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." @@ -8382,9 +9261,9 @@ "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico." -#: ../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 "Naj vstavek onemogočim?" -#: ../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 " @@ -8394,13 +9273,13 @@ "njegovo odstranitev iz spomina." -#: ../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" @@ -8411,5 +9290,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" @@ -8420,18 +9299,18 @@ msgstr[3] "Sprejeti podatki o vstavkih z {0} strežnikov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Informacij o vsavku ni bilo mogoče najti." -#: ../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 "" -#: ../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 "Vsi nameščeni vstavki so posodobljeni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8444,9 +9323,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 "Sprejem manjkajočih vstavkov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8459,35 +9338,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}: Različica {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 "" -#: ../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 "Napaka pri branju datoteke s podatki o vstavkih: {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 "Ne stori ničesar" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Prijavi napako" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8501,18 +9380,18 @@ "urejevalnika JOSM, vas prosimo, da prijavite napako (podrobno, v angleščini)." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Nepričakovana napaka" -#: ../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 "Prosimo, prijavite težavo na {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 "Napišite (čim bolj) točne korake kako ponoviti napako!" -#: ../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 " @@ -8521,19 +9400,19 @@ "Preden prijavite napako poskusite posodobiti JOSM na najnovejšo različico." -#: ../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 "Prijava napake naj vsebuje vsaj naslednje informacije:" -#: ../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 "(besedilo je že bilo prekopirano na odložišče.)" -#: ../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 "" -#: ../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 "" @@ -8542,5 +9421,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8549,5 +9428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8557,5 +9436,5 @@ msgstr "" -#: ../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" @@ -8563,5 +9442,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8570,17 +9449,17 @@ msgstr "" -#: ../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 "(Namig: Bližnjice lahko urejate v nastavitvah.)" -#: ../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 "" @@ -8589,4 +9468,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8611,9 +9525,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 @@ -8621,27 +9553,40 @@ msgstr "Pošiljanje sledi" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Javna" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Izbrana možnost javno objavi sled na 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 "Opis" -#: ../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}" @@ -8649,47 +9594,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 "Sled GPX je bila uspešno poslana" -#: ../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 "Pošiljanje sledi GPX: {0}% ({1} od {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 "Ni obveznega opisa. Prosimo, vpišite opis sledi." -#: ../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 "Ni izbrana plast GPX. Sledi ni mogoče poslati." -#: ../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 "Pošiljanje sledi GPX" @@ -8798,19 +9743,19 @@ msgstr "Naloži slike v novo plast." -#: ../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 "Datoteke 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 "" -#: ../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 "Napaka pri razčlenjevanju {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." @@ -8819,34 +9764,34 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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" @@ -8854,69 +9799,69 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Vse slike" -#: ../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 "" -#: ../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 "" -#: ../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:587 +msgid "You should select a GPX track" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../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 "" @@ -8925,9 +9870,9 @@ msgstr "" -#: ../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 "" @@ -8936,65 +9881,65 @@ msgstr "" -#: ../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:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -9002,13 +9947,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9029,5 +9974,5 @@ msgstr "Napaka v datoteki {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9040,12 +9985,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 "Izberi vse" - -#: ../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 "" @@ -9076,6 +10020,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9084,21 +10028,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" @@ -9107,37 +10051,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 "" -#: ../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." @@ -9149,18 +10104,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9168,5 +10123,5 @@ msgstr "" -#: ../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). " @@ -9174,39 +10129,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../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 +#: ../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 "" -#: ../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 "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9262,12 +10217,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Vzpostavljanje povezave s strežnikom..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "slika ni naložena" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9301,20 +10254,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" @@ -9322,9 +10275,14 @@ 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 +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" @@ -9332,29 +10290,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "Prilepi" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "Nič" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -msgid "Set Lambert coordinate" -msgstr "" +msgid "Set " +msgstr "Izberite" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9416,6 +10384,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)" @@ -9437,6 +10405,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 "Prazna plast" @@ -9452,7 +10420,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Plasti: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -9972,6 +10940,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 "" @@ -9984,8 +10952,4 @@ msgid "land" msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "brez" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10270,9 +11234,9 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10281,5 +11245,5 @@ msgstr "" -#: ../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 "" @@ -10838,5 +11802,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 "Ime ceste" @@ -10855,29 +11819,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 "Oprostite, to ne deluje z anonimnimi uporabniki" @@ -10891,23 +11855,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 "" -#: ../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" @@ -10916,38 +11872,38 @@ msgstr "" -#: ../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 "" -#: ../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 " @@ -10955,81 +11911,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Poenostavi pot" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Izbriši nepotrebna vozlišča iz poti." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." -#: ../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?" @@ -11039,25 +11995,25 @@ msgstr[1] "" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Ali ste prepričani?" -#: ../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 "Mreža" -#: ../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 "" @@ -11144,53 +12100,53 @@ msgstr "Izvede preverbo veljavnosti podatkov" -#: ../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 "Napake v podatkih. Vseeno pošljem?" -#: ../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 "Povečava na težavo" -#: ../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 "Popravi" -#: ../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 "Popravi izbrane napake" -#: ../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 "Prezri" -#: ../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 "Naslednjič prezri izbrane napake." -#: ../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 "Celotna skupina" -#: ../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 "Posamezen element" -#: ../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 "Nič" -#: ../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 "Prezri celotno skupino ali posamezne elemente?" -#: ../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 "Preziranje elementov" -#: ../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" @@ -11215,20 +12171,50 @@ #: ../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." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +"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:122 +#, fuzzy +msgid "Crossing buildings" +msgstr "zgradba" + +#: ../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 "Podvojena vozlišča" -#: ../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 +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 "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +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 "Izbriši vozlišča ali poti" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11311,23 +12297,23 @@ msgstr "" -#: ../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 "Preverjanje lastnosti:" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -11336,7 +12322,7 @@ msgstr "" +#: ../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 "" @@ -11344,80 +12330,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 "" -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "" +#: ../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:594 -msgid "Check property keys." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +msgid "Use complex property checker." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 -msgid "Use complex property checker." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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 "" -#: ../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." @@ -11425,82 +12411,82 @@ msgstr "" +#: ../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:688 -msgid "Add a new source to the list." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691 msgid "Data sources" msgstr "Viri podatkov" -#: ../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 "Preveri vrednosti lastnosti." -#: ../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 "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 +msgid "Check for FIXMES." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 -msgid "Check for FIXMES." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +#: ../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:728 -msgid "Check for paint notes." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Uporabi privzeto datoteko." -#: ../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 "Uporabi privzeto datoteko (priporočeno)." +#: ../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 "Uporabi privzeto datoteko za črkovanje." -#: ../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 "Uporabi privzeto datoteko za črkovanje (priporočeno)." -#: ../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 "Popravi lastnosti" -#: ../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 "" -#: ../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}''" @@ -11645,7 +12631,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 "zgradba" @@ -11659,5 +12645,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 "" @@ -11793,5 +12779,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "" @@ -11836,14 +12822,14 @@ msgstr "Pomoč vstavka 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}" @@ -11854,26 +12840,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 "" -#: ../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 "" -#: ../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 " @@ -11881,37 +12867,55 @@ msgstr "" -#: ../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 "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 -msgid "Adjust WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -11924,104 +12928,141 @@ msgstr "Samodejno sprejemanje" -#: ../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 +msgid "(deactivated)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../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 "" -#: ../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 +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" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../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 "Shrani plast WMS v datoteko" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Naloži plast WMS iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {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 "Odpri prazno plast WMS za nalaganje podatkov iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Nastavitve WMS vstavka" -#: ../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 "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka" -#: ../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 "Naziv v meniju" -#: ../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 "Povezava do 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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Vpišite ime za meni in povezavo do 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 "Povečava na izbrane predmete" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Izberite vsaj eno pot" + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12382,62 +13423,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 "Plast" #. item "Streets/Motorway" combo "Layer" @@ -12452,5 +13438,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 "Voznih pasov" @@ -12465,5 +13451,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" @@ -12473,10 +13458,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 "Najvišja hitrost (km/h)" @@ -12520,9 +13505,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 "Enosmerna" @@ -12570,13 +13555,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 "Most" @@ -12618,13 +13603,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 "Predor" @@ -12664,12 +13649,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 "Usek" @@ -12709,12 +13694,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 "Nasip" @@ -12870,17 +13855,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 "" @@ -12907,4 +13892,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" @@ -12923,11 +13909,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 "Površina" @@ -12937,4 +13924,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" @@ -12949,9 +13937,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 "" @@ -12959,9 +13948,70 @@ #: 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 +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 "Izposojevalnica" + +#. 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 +msgid "paving_stones" msgstr "" @@ -12970,11 +14020,92 @@ #: 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 "izbor" + +#: 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 "nepopoln" + +#: 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 +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 "" @@ -13056,20 +14187,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Cestne omejitve" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Uredi cestne omejitve" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Cestnina" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Brez izhoda (slepa ulica)" @@ -13082,8 +14213,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 "Dostop" @@ -13118,32 +14249,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 "da" @@ -13156,40 +14302,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 "" @@ -13202,19 +14348,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 "" @@ -13237,65 +14383,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 "" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "" @@ -13310,10 +14461,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 "" @@ -13329,17 +14480,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" @@ -13351,30 +14501,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 "Najnižja hitrost (km/h)" @@ -13382,25 +14532,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 "Krožišče" @@ -13411,5 +14561,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 "" @@ -13425,5 +14575,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" #. @@ -13431,9 +14581,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 "Vrsta" @@ -13453,10 +14603,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 "" @@ -13478,10 +14628,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 "hitra cesta" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "" @@ -13503,10 +14653,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 "glavna" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "" @@ -13528,5 +14678,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" @@ -13541,9 +14691,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "regionalna (turistična)" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "" @@ -13557,9 +14707,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 "" @@ -13589,10 +14739,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 "" @@ -13622,6 +14772,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 "" @@ -13632,10 +14782,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 "Uredi most" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "" @@ -13643,19 +14793,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Poti" #. 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 "" @@ -13671,5 +14821,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "krožišče" @@ -13678,5 +14828,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "" @@ -13684,5 +14834,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "" @@ -13690,5 +14840,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Kolesarska steza" @@ -13698,11 +14848,16 @@ #. 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 "Uredi kolesarsko stezo" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +msgid "Pedestrians" +msgstr "" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Pešpot" @@ -13711,11 +14866,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Uredi pešpot" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Ovire" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "" @@ -13724,5 +14885,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "" @@ -13730,5 +14891,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Stopnice" @@ -13738,5 +14899,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 "Uredi stopnice" @@ -13745,5 +14906,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "" @@ -13752,39 +14913,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 "" @@ -13793,5 +14926,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "" @@ -13799,5 +14932,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "" @@ -13806,5 +14939,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "" @@ -13812,5 +14945,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "" @@ -13819,5 +14952,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "" @@ -13825,5 +14958,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "" @@ -13832,5 +14965,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "" @@ -13838,5 +14971,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "" @@ -13845,5 +14978,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "" @@ -13852,5 +14985,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Steza" @@ -13859,19 +14992,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Uredi stezo" -#: 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 "" @@ -13881,5 +15017,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 "" @@ -13887,5 +15023,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "" @@ -13895,5 +15031,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 "" @@ -13901,5 +15037,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "" @@ -13909,5 +15045,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 "" @@ -13915,5 +15051,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "" @@ -13923,5 +15059,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 "" @@ -13929,5 +15065,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "" @@ -13937,5 +15073,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 "" @@ -13943,5 +15079,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "" @@ -13951,5 +15087,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 "" @@ -13957,10 +15093,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 "Avtocestno križišče" @@ -13968,15 +15104,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Uredi avtocestno križišče" #. 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 "" @@ -13984,5 +15120,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -13996,4 +15132,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" #. @@ -14013,18 +15151,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 "" @@ -14033,5 +15173,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Semafor" @@ -14041,5 +15181,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -14048,27 +15188,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 "" @@ -14076,6 +15216,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 "" @@ -14084,11 +15224,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 "" @@ -14096,30 +15236,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 "Stop znak" @@ -14127,5 +15267,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14134,14 +15274,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14152,14 +15292,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 "Obračališče" @@ -14169,20 +15309,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 "Znak za naselje" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Uredi znak za naselje" #. 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 "" @@ -14190,5 +15330,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "" @@ -14196,5 +15336,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14202,5 +15342,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14209,10 +15349,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 "" @@ -14220,5 +15360,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Gorski prelaz" @@ -14226,5 +15366,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Uredi gorski prelaz" @@ -14232,11 +15372,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 "" @@ -14244,5 +15384,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Ovire" @@ -14250,5 +15390,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Stebriček" @@ -14256,5 +15396,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "" @@ -14299,16 +15439,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 "" @@ -14317,5 +15457,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14323,5 +15463,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Rešetka za živino" @@ -14329,10 +15469,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 "" @@ -14340,15 +15480,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 "Cestninska postaja" @@ -14356,5 +15496,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Uredi cestninsko postajo" @@ -14362,10 +15502,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 "" @@ -14375,5 +15515,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "" @@ -14382,5 +15522,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "" @@ -14389,5 +15529,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "" @@ -14395,5 +15535,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "" @@ -14402,5 +15542,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "" @@ -14412,15 +15552,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 "Vrata" @@ -14428,50 +15568,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 "" @@ -14479,25 +15619,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 "" @@ -14508,10 +15648,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 "Voda" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Izvir" @@ -14519,5 +15659,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Uredi izvir" @@ -14525,5 +15665,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14531,10 +15671,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 "Potok" @@ -14542,10 +15682,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Uredi potok" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -14553,10 +15693,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Uredi kanal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Reka" @@ -14566,5 +15706,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 "Uredi reko" @@ -14572,15 +15712,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Uredi vodo" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Kopno" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Uredi kopno" @@ -14588,15 +15728,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 "" @@ -14604,15 +15744,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 "" @@ -14620,5 +15760,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "" @@ -14627,10 +15767,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 "" @@ -14641,14 +15781,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 "" @@ -14662,35 +15802,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 "" @@ -14698,20 +15838,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 "" @@ -14719,10 +15859,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 "" @@ -14730,5 +15870,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "" @@ -14736,5 +15876,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Pot trajekta" @@ -14742,5 +15882,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "" @@ -14749,5 +15889,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Ladjedelnica" @@ -14755,10 +15895,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Uredi ladjedelnico" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dók" @@ -14766,5 +15906,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Uredi dók" @@ -14772,5 +15912,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Jez" @@ -14778,15 +15918,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Uredi jez" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Vodna točka" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Vodna zapornica" @@ -14795,5 +15935,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "" @@ -14801,20 +15941,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 "Slap" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Uredi slap" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Obračališče" @@ -14823,15 +15963,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 "Pomol" @@ -14839,10 +15979,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Uredi pomol" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "" @@ -14850,10 +15990,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 "" @@ -14863,5 +16003,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 "" @@ -14869,10 +16009,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Železnica" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Železniški tir" @@ -14880,5 +16020,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Uredi železniški tir" @@ -14908,8 +16048,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 "Vrsta (neobvezno)" @@ -14923,35 +16063,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 "Tir ozkotirne železnice" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Uredi tir ozkotirne železnice" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "" @@ -14959,45 +16099,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 "Podzemna" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Uredi podzemno" -#: 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 "" @@ -15005,5 +16145,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "" @@ -15012,14 +16152,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Nerabljen tir" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Uredi nerabljen tir" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Zapuščeni tir" @@ -15028,5 +16168,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "" @@ -15035,5 +16175,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "" @@ -15043,5 +16183,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15049,5 +16189,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Okretnica" @@ -15056,10 +16196,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Žičnica" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Sedežnica" @@ -15067,10 +16207,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Uredi sedežnico" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Vlečnica" @@ -15078,10 +16218,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Uredi vlečnico" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Kabinska žičnica" @@ -15089,10 +16229,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Uredi kabinsko žičnico" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15100,5 +16240,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15106,5 +16246,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 "Postaja" @@ -15115,10 +16255,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 "Uredi postajo" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Gorivo" @@ -15128,9 +16268,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 "Uredi gorivo" #. 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" @@ -15150,47 +16519,73 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Uredi parkirišče" #. item "Car/Parking" text "Name" -#. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 -msgid "Capacity" +#. 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:1386 +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "" + +#: build/trans_presets.java:1392 msgid "surface" msgstr "" -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "" - -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1392 msgid "underground" msgstr "" -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 +#: build/trans_presets.java:1393 +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 +msgid "Capacity (overall)" +msgstr "" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 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 +#: build/trans_presets.java:1398 +msgid "Spaces for Women" +msgstr "" + +#: build/trans_presets.java:1399 +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:1391 +#: build/trans_presets.java:1403 msgid "Edit Car Wash" msgstr "" @@ -15198,5 +16593,5 @@ #. item "Car/Wash" text "Operator" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 +#: build/trans_presets.java:1408 build/trans_presets.java:1452 msgid "Shop" msgstr "" @@ -15204,15 +16599,15 @@ #. item #. -#: build/trans_presets.java:1398 +#: build/trans_presets.java:1410 msgid "Edit Car Shop" msgstr "" #. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 +#: build/trans_presets.java:1415 msgid "Repair" msgstr "" #. item -#: build/trans_presets.java:1404 +#: build/trans_presets.java:1416 msgid "Edit Car Repair" msgstr "" @@ -15220,5 +16615,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 +#: build/trans_presets.java:1421 build/trans_presets.java:1445 msgid "Rental" msgstr "Izposojevalnica" @@ -15227,10 +16622,10 @@ #. -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1424 msgid "Edit Car Rental" msgstr "Uredi izposojevalnico avtomobilov" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1429 msgid "Sharing" msgstr "" @@ -15238,5 +16633,5 @@ #. item #. -#: build/trans_presets.java:1419 +#: build/trans_presets.java:1431 msgid "Edit Car Sharing" msgstr "" @@ -15244,6 +16639,11 @@ #. item #. -#: build/trans_presets.java:1428 +#: build/trans_presets.java:1440 msgid "Edit Bicycle Parking" +msgstr "" + +#. item "Bicycle/Parking" text "Name" +#: build/trans_presets.java:1443 +msgid "Capacity" msgstr "" @@ -15251,5 +16651,5 @@ #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Uredi izposojevalnico koles" @@ -15258,15 +16658,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 "Javni prevoz" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -15274,5 +16674,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železniško postajališče" @@ -15280,5 +16680,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15286,5 +16686,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -15293,5 +16693,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -15299,5 +16699,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železniški peron" @@ -15306,5 +16706,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Uredi železniški peron" @@ -15316,5 +16716,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 "" @@ -15322,10 +16722,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 "Vhod v podzemno" @@ -15334,10 +16734,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Uredi vhod v podzemno" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -15346,5 +16746,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Avtobusna postaja" @@ -15353,5 +16753,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Uredi avtobusno postajo" @@ -15359,5 +16759,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Avtobusno postajališče" @@ -15367,5 +16767,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 "Uredu avtobusno postajališče" @@ -15374,8 +16774,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 "" @@ -15383,10 +16781,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Avtobusni peron" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Uredi avtobusni peron" @@ -15394,5 +16792,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taksi" @@ -15400,5 +16798,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Uredi postajališče taksijev" @@ -15406,5 +16804,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Letališče" @@ -15412,15 +16810,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 "" @@ -15429,5 +16827,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Nastanitev" @@ -15439,5 +16837,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -15446,15 +16844,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 "" @@ -15462,20 +16860,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 "" @@ -15483,10 +16881,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 "" @@ -15494,30 +16892,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 "" @@ -15525,10 +16923,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 "Hrana in pijača" @@ -15539,5 +16937,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -15545,5 +16943,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "" @@ -15551,5 +16949,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 "" @@ -15557,61 +16955,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 "" @@ -15619,9 +17017,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 "" @@ -15629,10 +17027,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 "Pivnica" @@ -15640,20 +17037,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Uredi pivnico" -#. 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 "" @@ -15661,10 +17056,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 "" @@ -15672,33 +17066,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 "Turizem" #. 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 "Muzej" @@ -15706,10 +17091,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Uredi muzej" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Živalski vrt" @@ -15718,10 +17102,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Uredi živalski vrt" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Razgledišče" @@ -15729,25 +17112,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Uredi razgledišče" #. 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 "Umetnina" @@ -15755,5 +17137,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Uredi umetnino" @@ -15761,86 +17143,206 @@ #. 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 "Zemljevid" #. 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 "Stop znak" + +#. 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 +msgid "scheme" +msgstr "" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Sprejmi področje" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Prilepi" + +#: build/trans_presets.java:1721 +msgid "city" +msgstr "" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "relacije" #. 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 "Kolesarjenje" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +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 "Smučanje" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "zgradba" + +#. 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 "Uredi kontinent" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "Policijska postaja" + +#: 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 "raba tal" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Informacije" + +#. 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 "Opis GPS sledi" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Zvok" + +#. +#: build/trans_presets.java:1775 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" +#: build/trans_presets.java:1776 +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 "" @@ -15848,25 +17350,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 "Zgodovinski kraji" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Grad" @@ -15875,20 +17377,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Uredi grad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruševine" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Uredi ruševine" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Arheološko najdišče" @@ -15897,10 +17398,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Uredi arheološko najdišče" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "" @@ -15908,5 +17408,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "" @@ -15914,15 +17414,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 "" @@ -15930,45 +17430,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 "Prosti čas" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Vodni park" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Uredi vodni park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Igrišče" @@ -15976,15 +17476,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Uredi igrišče" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Ribarjenje" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Uredi ribarjenje" @@ -15992,15 +17492,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 "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Uredi stadion" @@ -16014,6 +17514,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 "izberite šport:" @@ -16405,30 +17905,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 "šport" @@ -16438,227 +17938,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 "lokostrelstvo" -#: 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 "košarka" -#: 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 "plezanje" -#: 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 "kolesarjenje" -#: 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 "golf" -#: 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 "gimnastika" -#: 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 "hokej" -#: 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 "strelišče" -#: 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 "smučanje" -#: 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 "nogomet" -#: 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 "plavanje" -#: 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 "namizni_tenis" -#: 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 "tenis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Športno središče" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Uredi športno središče" -#: 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 "Golf igrišče" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Uredi golf igrišče" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Mini golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Uredi mini golf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Šport" #. 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 "" @@ -16697,248 +18195,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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "Lokostrelstvo" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Uredi lokostrelstvo" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Plezanje" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Uredi plezanje" -#: 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 "Kolesarjenje" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Uredi kolesarjenje" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Pasje dirke" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Uredi pasje dirke" -#: 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 "Konjske dirke" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Uredi konjske dirke" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gimnastika" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Uredi gimnastiko" -#: 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 "Plavanje" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Uredi plavanje" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Smučanje" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Uredi smučanje" #. 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 "Strelišče" @@ -16946,178 +18436,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Uredi strelišče" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Šport (z žogo)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Nogomet" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Uredi nogomet" -#: 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 "Košarka" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Uredi košarko" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Uredi golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golf_igrišče" -#: 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 "Hokej" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Uredi hokej" -#: 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 "Namizni tenis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Uredi namizni tenis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tenis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Uredi tenis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Zgradbe" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Zgradba" @@ -17125,5 +18615,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Javne zgradbe" @@ -17131,10 +18621,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Uredi javno zgradbo" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Mestna hiša" @@ -17142,10 +18632,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Uredi mestno hišo" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Veleposlaništvo" @@ -17153,10 +18643,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Uredi veleposlaništvo" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Sodišče" @@ -17165,10 +18655,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Uredi sodišče" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Zapor" @@ -17177,10 +18667,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Uredi zapor" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Policijska postaja" @@ -17190,10 +18680,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 "Uredi policijsko postajo" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Gasilski dom" @@ -17202,10 +18692,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Uredi gasilski dom" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Pošta" @@ -17213,5 +18703,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Uredi pošto" @@ -17219,15 +18709,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 "Šola" @@ -17235,10 +18725,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Uredi šolo" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "" @@ -17246,10 +18736,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 "" @@ -17257,5 +18747,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "" @@ -17263,5 +18753,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kinematograf" @@ -17270,10 +18760,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Uredi kinematograf" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Knjižnica" @@ -17282,10 +18772,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Uredi knjižnico" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "" @@ -17293,10 +18782,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 "Gledališče" @@ -17305,10 +18794,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Uredi gledališče" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Kraj čaščenja" @@ -17318,5 +18807,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 "Uredi kraj čaščenja" @@ -17325,6 +18814,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 "Vera" @@ -17333,66 +18822,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 "" @@ -17401,81 +18890,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 "Naslovi" @@ -17484,5 +18973,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Urejanje podatkov o naslovu" @@ -17490,5 +18979,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "" @@ -17496,20 +18985,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 "Poštna številka" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "" @@ -17517,5 +19006,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolacija naslovov" @@ -17524,5 +19013,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Uredi interpolacijo naslovov" @@ -17530,71 +19019,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 "Stolp" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Uredi stolp" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vodni stolp" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Uredi vodni stolp" #. 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 "Svetilnik" @@ -17602,10 +19087,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Uredi svetilnik" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Mlin na veter" @@ -17613,10 +19098,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Uredi mlin na veter" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Cevovod" @@ -17624,10 +19109,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Uredi cevovod" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Čistilna naprava" @@ -17637,10 +19122,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 "Uredi čistilno napravo" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Žerjav" @@ -17648,10 +19133,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Uredi žerjav" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "" @@ -17659,10 +19144,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 "Geodetska točka" @@ -17670,10 +19155,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Uredi geodetsko točko" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Video nadzor" @@ -17681,5 +19166,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Uredi video nadzorno kamero" @@ -17687,5 +19172,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "" @@ -17695,39 +19180,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 "" @@ -17736,10 +19221,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 "" @@ -17748,5 +19233,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "" @@ -17754,10 +19239,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 "Steber daljnovoda" @@ -17768,5 +19253,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 "Uredi steber daljnovoda" @@ -17774,5 +19259,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "" @@ -17781,46 +19266,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 "Stranišča" -#. 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 "Poštni nabiralnik" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -17829,5 +19308,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Uredi telefon" @@ -17835,5 +19314,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 "Kovanci" @@ -17841,5 +19320,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 "Bankovci" @@ -17847,5 +19326,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 "" @@ -17853,5 +19332,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 "Debetne kartice" @@ -17859,15 +19338,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 "Kreditne kartice" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonske kartice" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recikliranje" @@ -17876,5 +19355,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Uredi raciklažno točko" @@ -17882,80 +19361,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 "Klopca" -#. 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 "" @@ -17964,10 +19439,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 "Pitna voda" @@ -17976,10 +19451,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Uredi pitno vodo" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -17987,25 +19462,34 @@ #. 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 "Trgovine" #. 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 +msgid "Chemist" +msgstr "" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Uredi grad" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "" @@ -18013,10 +19497,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 "" @@ -18024,10 +19507,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 "Uredu avtobusno postajališče" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Uredi drevo" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Prodajni avtomat" @@ -18035,5 +19537,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Uredi prodajni avtomat" @@ -18041,88 +19543,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Prodajani izdelki" #. 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 "pijača" -#: 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 kartice" -#: 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 "Mesar" @@ -18130,10 +19632,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Uredi mesarja" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Pekarna" @@ -18141,10 +19642,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Uredi pekarno" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "" @@ -18152,20 +19652,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 "" @@ -18173,60 +19671,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 "" @@ -18234,10 +19726,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 "" @@ -18245,10 +19736,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 "Sam svoj mojster" @@ -18256,60 +19746,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Uredi sam svoj mojster trgovino" -#. 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 "Čistilnica" @@ -18317,10 +19801,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Uredi čistilnico" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Pralnica" @@ -18328,10 +19811,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Uredi pralnico" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "" @@ -18339,35 +19821,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 "Denar" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banka" @@ -18375,16 +19854,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Uredi banko" -#. 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 "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Menjalnica" @@ -18392,5 +19869,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Uredi menjalnico" @@ -18398,15 +19875,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Uredi bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Zdravje" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "" @@ -18414,20 +19891,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 "Lekarna" @@ -18435,5 +19910,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Uredi lekarno" @@ -18441,10 +19916,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 "Bolnišnica" @@ -18452,10 +19926,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Uredi bolnišnico" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "" @@ -18464,5 +19938,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18471,20 +19945,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 "" @@ -18492,5 +19966,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 "" @@ -18499,55 +19973,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 "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Uredi kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Država" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Uredi državo" #. 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 "" @@ -18555,15 +20029,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "" #. 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 "" @@ -18571,10 +20045,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 "" @@ -18582,25 +20056,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 "Vas" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Uredi vas" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Zaselek" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Uredi zaselek" @@ -18608,5 +20082,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18614,10 +20088,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 "Otok" @@ -18625,11 +20099,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Uredi otok" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "levo" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Uredi grad" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "" @@ -18637,10 +20124,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 "Vrh" @@ -18648,10 +20135,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Uredi vrh" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "" @@ -18659,10 +20146,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 "" @@ -18670,70 +20157,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 "Meje" #. 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 "Raba tal" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Drevo" @@ -18742,15 +20229,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Uredi drevo" #. 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 "" @@ -18759,5 +20246,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "" @@ -18765,17 +20252,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 "Gozd" @@ -18784,14 +20271,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Uredi gozdnata tla" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Naravni rezervat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Uredi naravni rezervat" @@ -18799,25 +20286,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 "" @@ -18825,10 +20312,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 "" @@ -18836,5 +20323,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "" @@ -18842,5 +20329,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -18849,45 +20336,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 "Vinograd" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Uredi vinograd" #. 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 "" @@ -18895,25 +20382,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 "" @@ -18921,10 +20408,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 "" @@ -18932,20 +20419,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 "" @@ -18953,5 +20440,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -18959,15 +20446,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 "Pokopališče" @@ -18975,9 +20462,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Uredi pokopališče" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "" @@ -18985,39 +20472,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 "Ozemlje železnice" @@ -19025,15 +20512,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Uredi ozemlje železnice" #. 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 "" @@ -19041,55 +20528,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Gradbišče" #. 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 "Kamnolom" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Uredi kamnolom" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "" @@ -19099,5 +20586,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 "" @@ -19106,10 +20593,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 "" @@ -19117,5 +20604,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19124,5 +20611,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19130,34 +20617,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 "" @@ -19166,15 +20653,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 "" @@ -19182,5 +20669,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19189,5 +20676,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19195,5 +20682,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19265,5 +20752,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 @@ -19272,17 +20759,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 "" @@ -19335,5 +20822,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 @@ -19342,13 +20829,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 "" @@ -19362,10 +20849,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 "" @@ -19373,31 +20860,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 "" @@ -19406,30 +20893,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 "" @@ -19867,11 +21354,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 "" @@ -20196,41 +21683,4 @@ #: build/trans_style.java:542 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 "" @@ -21932,5 +23382,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 "" @@ -22529,55 +23979,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22591,5 +23992,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 "" @@ -22661,8 +24062,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 "" @@ -22733,8 +24134,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 "" @@ -22748,5 +24149,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "" @@ -22760,5 +24161,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22780,5 +24181,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22792,5 +24193,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "" @@ -22804,5 +24205,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22825,5 +24226,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22837,5 +24238,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "" @@ -22849,5 +24250,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22861,5 +24262,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22873,5 +24274,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -22928,7 +24329,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 "" @@ -22942,5 +24343,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "" @@ -22953,5 +24354,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "" @@ -22966,5 +24367,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "" @@ -22978,5 +24379,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "" @@ -23031,8 +24432,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 "" @@ -23046,5 +24447,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23058,18 +24459,6 @@ #. #. -#: 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 "" @@ -23082,5 +24471,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "" @@ -23094,5 +24483,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "" @@ -23170,8 +24559,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 "" @@ -23219,7 +24608,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 "" @@ -23361,10 +24750,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 "" @@ -23412,6 +24810,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 "" @@ -23708,4 +25106,36 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Namig: Do nekaterih sprememb je prišlo zaradi pošiljanja podatkov na " +#~ "strežnik." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Dokument ni odprt, zato ni kaj shraniti." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Izbriši {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}" + +#~ msgid "nodes" +#~ msgstr "vozlišča" + +#~ msgid "ways" +#~ msgstr "poti" + +#~ msgid "relations" +#~ msgstr "relacije" + +#~ msgid "changesets" +#~ msgstr "paketi sprememb" + +#~ msgid "Public" +#~ msgstr "Javna" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org" + #~ msgid "Move" #~ msgstr "Premakni" @@ -23757,7 +25187,4 @@ #~ msgstr "Spremeni" -#~ msgid "Not implemented yet." -#~ msgstr "Še ni podprto." - #~ msgid "Email" #~ msgstr "E-pošta" @@ -23765,7 +25192,4 @@ #~ msgid "unnamed" #~ msgstr "neimenovano" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Razreši {0} sporov v {1} predmetih" #~ msgid "Unknown file extension." Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 17484) +++ /applications/editors/josm/i18n/po/sv.po (revision 17485) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" "PO-Revision-Date: 2009-08-04 10:57+0000\n" "Last-Translator: Konrad Skeri \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\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 "Skapar huvudgränssnittet" #. 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 "Hjälp" -#: ../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 "Projektionen {0} kunde inte aktiveras. Använder Merkator" -#: ../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 @@ -96,155 +99,160 @@ #: ../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 "Fel" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Tips: Några av ändringarna härrör från inskickning av nya data till servern." - -#: ../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] "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?" +msgstr[1] "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Osparade ändringar" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?" - -#: ../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 "Spara och avsluta" -#: ../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 "Kassera och avsluta" -#: ../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 "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{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 "Varning" -#: ../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 "Hoppar över felaktig URL till en fil: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -269,7 +277,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" @@ -307,5 +316,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" @@ -329,6 +338,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 "Insticksmoduler" @@ -343,17 +352,26 @@ #: ../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 "" "VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för " "OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{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 "" +"VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för " +"OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -364,5 +382,5 @@ "primitiven." -#: ../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 "" @@ -372,11 +390,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -385,5 +403,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 "" @@ -400,11 +418,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 @@ -433,5 +451,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 "Latitud" @@ -440,30 +458,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 "Longitud" +#: ../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 "Bilda en cirkel av noderna" -#: ../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 "Flytta de valda noderna in i en cirkel" -#: ../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 @@ -477,6 +495,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 @@ -484,58 +502,57 @@ msgstr "Verktyg: {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 "Välj åtminstone fyra noder." #. 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 "Information" #. 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 "Placera noderna i en rak linje" -#: ../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 "Flytta de valda noderna in i en linje" -#: ../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 "Välj åtminstone tre noder." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -546,10 +563,10 @@ "är {0}, max är {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 "Bryter mot API:ns möjligheter" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -560,5 +577,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -569,9 +586,9 @@ "tillåtna längden ({2}). Värdets längd är {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}" @@ -579,37 +596,37 @@ "{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "lager" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "urval" -#: ../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 "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "nedhämtad data" +#: ../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 "Zooma till {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 "Zooma det visade till {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 @@ -619,22 +636,22 @@ msgstr "Visa: {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 "Det finns inte något valt att zooma till" -#: ../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 "Det finns inte några konflikter att zooma till" +#: ../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 "Slå ihop sträckor" -#: ../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 "Förena flera sträckor till en enda." -#: ../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 "Välj åtminstone två sträckor att slå ihop" @@ -645,4 +662,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Slå ihop i alla fall" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -651,19 +672,7 @@ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Slå ihop i alla fall" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Ändra riktning?" - -#: ../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 "" -"Sträckorna kan inte slås ihop med bibehållen riktning. Vill du vända på " -"några av dem?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -671,27 +680,34 @@ msgstr "Byt riktning och slå ihop" -#: ../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 "" +"Sträckorna kan inte slås ihop med bibehållen riktning. Vill du vända på " +"några av dem?" + +#: ../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 "Ange värden för alla konflikter" -#: ../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 "Jämka konflikter" -#: ../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 "Slå ihop {0} sträckor" -#: ../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 "Alla sträckor var tomma" -#: ../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 " @@ -701,32 +717,32 @@ "noder av dem)" +#: ../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 "Kopiera" -#: ../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 "Kopiera valda objekt till inklistringsbuffern." -#: ../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 "Välj någonting att kopiera." +#: ../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 "Skapa cirkel" -#: ../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 "Skapa en cirkel av tre valda noder." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -738,20 +754,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 "Ta bort" @@ -761,85 +777,86 @@ msgstr "Ta bort valda objekt." -#: ../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 "Skriv över" -#: ../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 "Filen existerar redan. Vill du skriva över?" #. 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 "Distribuera noder" -#: ../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 "Distribuera de valda noderna på jämna avstånd längs en linje." +#: ../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 "Hämta från 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 "Hämta kartdata från OSM-servern." -#: ../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 "Arkiv: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Hämta" -#: ../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 "Välj åtminstone en uppgift att hämta" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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} konflikter uppstod under import." -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -848,6 +865,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 "Duplicera" @@ -871,85 +888,91 @@ msgstr "Avsluta programmet." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Alla bilder" + +#: ../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 "Exportera till 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 "Exportera data till en GPX-fil" -#: ../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 "Det finns inte något att exportera. Skaffa lite data först." -#: ../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 "parametern ''{0}'' får inte vara null" -#: ../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 "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Onlinehjälp för 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 "Öppna i webbläsare" -#: ../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 "Redigera" -#: ../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 "Uppdatera" -#: ../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 "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM" -#: ../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 "Fel vid inläsning av sida{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." msgstr "Hjälpsida saknas. Skapa den på engelska." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1003,22 +1026,26 @@ 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 "Slå ihop noder" -#: ../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 "Slå ihop noder med den äldsta." -#: ../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 "Välj åtminstone två noder att slå ihop." -#: ../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 "Slå ihop noder med olika medlemskap?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Slå ihop i alla fall" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1027,9 +1054,5 @@ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Slå ihop i alla fall" - -#: ../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 "" @@ -1037,69 +1060,69 @@ "behöva tas bort." -#: ../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 "Slå ihop {0} noder" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "Spegel" -#: ../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 "Spegla markerade noder och sträckor." -#: ../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 "Markera minst en nod eller sträcka." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "upp" -#: ../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 "Flytta objekt {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "vänster" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "höger" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Flytta {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 "Flytta objekt {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 "Kan inte flytta objekt utanför världen." @@ -1107,5 +1130,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 "Ny" @@ -1115,17 +1138,22 @@ msgstr "Skapa ny karta" -#: ../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 "Öppna..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Öppna en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Öppna en fil." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Okänd roll ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1163,21 +1191,17 @@ msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Enbart två noder kan vara valda" -#: ../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 "Urvalet måste bestå uteslutande av sträckor." -#: ../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 "Välj en eller flera slutna sträckor med åtminstone fyra noder." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Välj sträckor som nästan har räta vinklar att räta upp." - -#: ../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 " @@ -1186,9 +1210,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 "Enbart en nod vald" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Räta upp" @@ -1204,15 +1228,28 @@ msgstr "Klistra in innehållet i inklistringsbuffern" -#: ../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 "Klistra in taggar" -#: ../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 "" "Sätt taggarna som finns på innehållet i inklistringbuffern på alla valda " "föremål." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Hämtar {0}" +msgstr[1] "Hämtar {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Ångra radering av {0} primitiv" +msgstr[1] "Ångra radering av {0} primitiv" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1238,37 +1275,32 @@ msgstr "Gör om den senaste ogjorda handlingen." -#: ../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 "Byt namn på lager" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Byt också namn på filen" -#: ../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 "" +#: ../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 "Ändra riktning på sträckor" -#: ../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 "Ändra riktningen på alla valda sträckor." -#: ../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 "Välj åtminstone en sträcka." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Ändra riktning på sträckor" @@ -1276,10 +1308,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 "Spara" #: ../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 "Spara nuvarande data." @@ -1290,38 +1323,25 @@ msgstr "Fil {0} existerar redan. Skriv över?" -#: ../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 "" -"Internt fel: kan inte kontrollera förhållanden för inget lager. Rapportera " -"in detta som ett fel." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "" -"Det finns inte något öppet dokument, så det finns inte något att spara." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Tomt dokument" -#: ../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 "Dokumentet innehåller inte någon data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Spara i alla fall" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikter" -#: ../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 " @@ -1331,28 +1351,28 @@ "som om du avvisat dem alla. Fortsätt?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Avvisa konflikter och spara" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Spara OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Spara GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Spara Lager" +#: ../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 "Spara som..." -#: ../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 "Spara nuvarande data i en ny fil." @@ -1386,33 +1406,33 @@ msgstr "Hjälp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Statusrapport" -#: ../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 "Kopiera till urklipp och stäng" -#: ../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 "Stäng" +#: ../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 "Dela sträcka" -#: ../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 "Dela sträckan vid vald nod." -#: ../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 "Det går inte att dela baserat på nuvarande urval." -#: ../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." @@ -1420,5 +1440,5 @@ msgstr[1] "De valda noderna ligger inte inuti någon sträcka." -#: ../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 " @@ -1434,9 +1454,9 @@ "sträckan." -#: ../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 "De valda noderna ingår inte i samma sträcka." -#: ../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." @@ -1444,10 +1464,10 @@ msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna." -#: ../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 "Du måste välja två eller fler noder för att dela en sluten sträcka." -#: ../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 " @@ -1457,5 +1477,5 @@ "sträckan.)" -#: ../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 " @@ -1463,5 +1483,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 " @@ -1469,8 +1489,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 "Dela sträcka {0} i {1} delar" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Stänger ändringssamling..." + +#: ../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 "Stänger ändringssamling..." + +#: ../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 "Öppnar ändringssamling..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Stänger ändringssamling..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1488,47 +1533,47 @@ msgstr "Byter läge för den globala inställningen ''{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 "Frigör sträckor" -#: ../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 "Duplicera noder som används av flera olika sträckor." -#: ../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 "Denna nod är inte bunden till något annat." -#: ../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 "Ingen av dessa noder hänger ihop med någonting annat." -#: ../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 "Ingen av noderna på denna sträcka är knuten till något annat." -#: ../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 "Det nuvarande urvalet kan inte användas för att frigöra något." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Välj antingen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* En nod med tagg, eller" -#: ../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 "* En nod som används av mer än en sträcka, eller" +#: ../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 "" +"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" + #: ../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 "" -"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" - -#: ../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" @@ -1537,5 +1582,5 @@ "eller" -#: ../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." @@ -1544,5 +1589,5 @@ "sträcka." -#: ../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" @@ -1557,9 +1602,9 @@ "få sina egna kopior och alla noder kommer att vara valda." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Frigjord nod" -#: ../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" @@ -1567,5 +1612,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" @@ -1609,61 +1654,71 @@ msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)" -#: ../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 +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Uppdatera markering" -#: ../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 "Uppdatera markerade primitiv från servern" -#: ../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 "Det finns inga markerade primitiv att uppdatera." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Tom markering" -#: ../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 "Skicka in till 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 "Skicka in alla ändringar till OSM-servern." -#: ../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 "Det finns olösta konflikter. Du måste lösa dessa först." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Det finns inte någonting att skicka in. Skaffa lite data först." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Det finns olösta konflikter. Du måste lösa dessa först." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Det finns inte några ändringar att skicka in." -#: ../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 "Synkronisera enbart {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 "Synkronisera hela datasetet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1677,17 +1732,17 @@ msgstr "" -#: ../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 "Konflikt upptäkt" #. 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 "oförväntat returvärde. Erhöll {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1703,5 +1758,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}\"" @@ -1709,27 +1764,65 @@ "Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\"" -#: ../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 "" -#: ../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 "Uppladdning misslyckades.
{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 "Uppladningen till OSM API misslyckades" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Uppdaterar primitiv" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Skicka in dessa ändringar?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Skicka in ändringar" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Lägg till en ny nod i en befintlig sträcka" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1737,31 +1830,79 @@ 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 "Ge en kort kommentar till de ändringar som du skickar in:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Kartinställningar" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Nya objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Ändrade objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Borttagna objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Ge en kort kommentar till de ändringar som du skickar in:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Skicka in dessa ändringar?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Skicka in ändringar" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Ladda Upp" +#: ../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] "Nya objekt:" +msgstr[1] "Nya objekt:" + +#: ../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] "Ändrade objekt:" +msgstr[1] "Ändrade objekt:" + +#: ../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] "Borttagna objekt:" +msgstr[1] "Borttagna objekt:" + +#: ../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 "Senast ändrad {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1785,20 +1926,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 "Ljud: {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 "Snabbare" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Snabbare framåt" @@ -1840,10 +1981,10 @@ msgstr "Spela upp föregående markering" -#: ../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 "Långsammare" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Långsammare framåt" @@ -1871,31 +2012,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 "Ingen data importerad." -#: ../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-data" -#: ../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 "Laddar ner {0} av {1} ({2} kvar)" -#: ../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 "Fel under nedladdning" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1912,20 +2049,20 @@ "
Klicka på {2} för att ignorera.
" -#: ../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 "Raderade eller flyttade primitiv" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Borttagningsläge" -#: ../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 "Ta bort noder eller sträckor" -#: ../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 @@ -1934,5 +2071,5 @@ msgstr "Läge: {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 " @@ -1942,55 +2079,69 @@ "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit" -#: ../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 "" +#: ../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 "Rita" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Rita noder" -#: ../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 @@ -1998,38 +2149,38 @@ msgstr "markerad" -#: ../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 "Det går inte att lägga till en nod utanför världen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Lägg till nod" -#: ../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 "Lägg till en nod till sträckan" -#: ../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 "Knyt en existerande nod till en sträcka" -#: ../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 "Lägg till en ny nod i en befintlig sträcka" -#: ../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 "Lägg till en nod i en sträcka och bind ihop" -#: ../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 "Skapa ny nod" -#: ../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 "Markera nod under pekare." -#: ../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." @@ -2038,14 +2189,14 @@ msgstr[1] "Infoga ny nod i {0} vägar." -#: ../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 "Starta ny väg från senaste nod." -#: ../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 "Fortsätt väg från senaste nod." -#: ../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 "Avsluta ritning." @@ -2065,5 +2216,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 "Släpp musknappen för att välja objekten i rektangeln." @@ -2074,5 +2225,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 "Släpp musknappen för att sluta rotera." @@ -2090,17 +2241,18 @@ "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten." +#: ../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 "Markera" -#: ../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 "Välj, flytta och rotera objekt." -#: ../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" @@ -2109,13 +2261,21 @@ msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flytta element" -#: ../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 "Flytta" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Ångra flytt" + +#: ../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 "" @@ -2124,13 +2284,9 @@ "Vill du verkligen flytta på dem?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Flytta" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Ångra flytt" - -#: ../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." @@ -2139,5 +2295,5 @@ "nod." -#: ../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-" @@ -2164,44 +2320,44 @@ "ned, höger; flytta karta med högerknappen" +#: ../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 "Sök..." -#: ../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 "Sök efter objekt." -#: ../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 "Ange en söksträng." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "ersätt urval" -#: ../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 "utöka urval" -#: ../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 "ta bort från urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "gör skillnad på gemener/VERSALER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "reguljärt uttryck" -#: ../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 "" @@ -2209,5 +2365,5 @@ "värde som helst." -#: ../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 "" @@ -2215,13 +2371,13 @@ "som helst." -#: ../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' var som helst i nyckeln name." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2229,17 +2385,17 @@ msgstr "" -#: ../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 - som inte har 'Bak' i nyckeln name." -#: ../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: - som innehåller nyckeln foot oavsett dess värde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Särskilda mål:" -#: ../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)" @@ -2248,47 +2404,48 @@ "relation för 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:... - alla objekt som ändrats av användare..." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objektet med angiven ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objektet med angiven ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt med givent antal noder" -#: ../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 - alla ändrade objekt" -#: ../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 - alla valda objekt" -#: ../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 - alla ofullständiga objekt" -#: ../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 "otaggade - alla otaggede objekt" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use | or OR to combine with logical or" msgstr "Använd | eller OR för att kombinera med logiskt ELLER" -#: ../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 "" @@ -2296,46 +2453,46 @@ "innehåller :)" -#: ../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 "Använd ( och ) för att gruppera uttryck" -#: ../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 "Sök" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Påbörja sökning" -#: ../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 "Inga sökträffar för ''{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 "Urvalet utökades inte genom att söka efter ''{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 "Urvalet begränsades inte genom att söka efter ''{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} sökträffar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "RX" @@ -2400,58 +2557,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Hämta urval" -#: ../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 "Kontakta {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Hämtar..." -#: ../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 "Kunde inte läsa från URL:en: \"{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 "Inläsningsfel på URL:en: \"{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 "Fel under kommunikation med servern." -#: ../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 "Lägg till nod" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Lägg till {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 "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Ändra {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 "Ändra {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Ändra relation" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Ta bort \"{0}\" för {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Ta bort \"{0}\" för {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 "Ta bort \"{0}\" för {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Sätt {0}={1} för {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 "Sätt {0}={1} för {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Sätt {0}={1} för {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" @@ -2460,10 +2655,10 @@ msgstr[1] "objekt" -#: ../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 "Ta bort \"{0}\" för {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}" @@ -2475,5 +2670,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2482,10 +2677,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2494,5 +2689,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}''" @@ -2518,44 +2713,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Ta bort {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Ta bort {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] "Ta bort {0} {1}" +msgstr[1] "Ta bort {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] "Borttagningsläge" +msgstr[1] "Borttagningsläge" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Ta bort {0} {1}" +msgstr[1] "Ta bort {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] "Ta bort från relation" +msgstr[1] "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relationskonflikt" -#: ../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 "Ta bort från relation" + +#: ../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 "" "Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n" "Ta bort från relationen?" -#: ../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 "Ta bort från relation" - -#: ../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 "" "Urvalet \"{0}\" ingår i relationen \"{1}\"\n" "Ta bort från relationen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Dela delsträcka" @@ -2563,6 +2774,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." @@ -2574,5 +2785,5 @@ "använder dem.
Vill du verkligen ta bort dem?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2583,5 +2794,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2616,10 +2827,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Radera relationsmedlem {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" @@ -2632,17 +2853,37 @@ msgstr "Sekvens" -#: ../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 "Lös {0} taggninskonfliker i {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 "Lös {0} taggninskonfliker i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Lös {0} taggninskonfliker i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Ångra radering av {0} primitiv" -#: ../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 "Lös versionskonfliker för {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Lös versionskonfliker för {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Lös versionskonfliker för {0} {1}" @@ -2669,13 +2910,13 @@ "sträckan och dess noder ändras så att dataintegriteten inte komprometteras." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relation" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Gammal roll" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Ny roll" @@ -2694,62 +2935,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 "Nytt värde" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Verkställ valda ändringar" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Verkställ inte ändringar" -#: ../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 "Välj vilka ändringar av egenskaper som du vill genomföra." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Egenskaper för " -#: ../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 "Automatisk taggrättning" -#: ../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 "Fel i konfigurationsfilen på raderna {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan inte öppna inställningsmappen: {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 "Det fanns fel i inställningsfilen. Backar upp den gamla som {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 "Inställningar lagrade på {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 "Kunde inte skicka in inställningar. Orsak: {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 "Kunde inte hämta inställningar från server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2763,29 +3061,36 @@ msgstr "" -#: ../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 "Decimalgrader" -#: ../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 "Grader Minuter Sekunder" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "V" -#: ../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}" @@ -2797,15 +3102,229 @@ msgstr "parameter {0} > 0 krävs. Erhöll {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 "ofullständig" - -#: ../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 "Fel: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Varning: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "Det finns inget primitiv med version {0} i denna historik" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "ingen tidigaste version funnen. Historiken är tom." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "ingen senaste version funnen. Historiken är tom." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "kan inte jämföra primitiv id ''{0}'' med primitiv 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "En sträcka för en yta är inte sluten." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Multipolygonsträckan ''{0}'' är inte sluten." + +#. 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 "Tom medlem i relationen." + +#: ../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 "Tog bort medlemmen ''{0}'' i relationen." + +#: ../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 "Sträcka \"{0} med mindre än två punkter." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Det finns mer än en \"från\"-sträcka." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Det finns mer än en \"till\"-sträcka." + +#: ../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 "Mer än en \"via\" hittades." + +#: ../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 "Okänd roll ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Okänd medlemstyp för ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Det finns inte någon \"från\"-sträcka." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Det finns inte någon \"till\"-sträcka." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Ingen nod eller sträcka för \"via\" hittades." + +#: ../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 "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." + +#: ../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 "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." + +#: ../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 "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." + +#: ../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 "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Stil för restriktion {0} kunde inte hittas." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Icke-sträcka ''{0}'' i multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Multipolygonen ''{0}'' saknar yttre sträcka." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Den inre sträckan ''{0}'' befinner sig utanför." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Stil för yttre väg ''{0}'' passar inte." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "otaggade" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "text" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inaktiv" + #: ../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" @@ -2814,22 +3333,7 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Fel: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Varning: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "noder" - -#: ../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" @@ -2838,12 +3342,7 @@ msgstr[1] "sträckor" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "vägar" - -#: ../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" @@ -2852,246 +3351,4 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relationer" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} medlem" -msgstr[1] "{0} medlemmar" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "landsväg" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "järnväg" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vattendrag" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "markanvändning" - -#: ../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} nod" -msgstr[1] "{0} noder" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Det finns inget primitiv med version {0} i denna historik" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "ingen tidigaste version funnen. Historiken är tom." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "ingen senaste version funnen. Historiken är tom." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "kan inte jämföra primitiv id ''{0}'' med primitiv 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "En sträcka för en yta är inte sluten." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Multipolygonsträckan ''{0}'' är inte sluten." - -#. 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 "Tom medlem i relationen." - -#: ../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 "Tog bort medlemmen ''{0}'' i relationen." - -#: ../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 "Sträcka \"{0} med mindre än två punkter." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Det finns mer än en \"från\"-sträcka." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Det finns mer än en \"till\"-sträcka." - -#: ../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 "Mer än en \"via\" hittades." - -#: ../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 "Okänd roll ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Okänd medlemstyp för ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Det finns inte någon \"från\"-sträcka." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Det finns inte någon \"till\"-sträcka." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Ingen nod eller sträcka för \"via\" hittades." - -#: ../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 "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." - -#: ../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 "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." - -#: ../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 "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." - -#: ../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 "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Stil för restriktion {0} kunde inte hittas." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Icke-sträcka ''{0}'' i multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Multipolygonen ''{0}'' saknar yttre sträcka." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Den inre sträckan ''{0}'' befinner sig utanför." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Stil för yttre väg ''{0}'' passar inte." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "otaggade" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "text" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inaktiv" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3104,5 +3361,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "bakgrund" @@ -3112,5 +3369,5 @@ msgstr "framhäv" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3120,5 +3377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3134,21 +3391,21 @@ "och börja på ett nytt lager i den nya zonen." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambertzon (Frankrike)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambertzon (Estland)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3169,8 +3426,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3178,12 +3435,60 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Visa inte igen" -#: ../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/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 "ofullständig" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "landsväg" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "järnväg" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vattendrag" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "markanvändning" + +#: ../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} nod" +msgstr[1] "{0} noder" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} medlem" +msgstr[1] "{0} medlemmar" + +#: ../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 "" "Kunde inte upprätta anslutning till OSM servern {0}.\n" @@ -3191,5 +3496,43 @@ "inställningar." -#: ../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 "okänd" + +#: ../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 "" @@ -3202,36 +3545,9 @@ "är:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Brott mot förhandsvillkor" -#: ../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 "okänd" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3241,9 +3557,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 "" @@ -3252,9 +3568,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3263,9 +3579,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 "" @@ -3275,9 +3602,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Okänd värddator" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3290,12 +3617,7 @@ "är:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitiv redan raderad" - -#: ../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 @@ -3312,38 +3634,38 @@ msgstr "Hämtar \"Dagens meddelande\"" -#: ../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 "Skicka in inställningar" -#: ../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 "Skicka in inställningar till servern" -#: ../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 "sträng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Användarnamn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM-lösenord" -#: ../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 "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)" -#: ../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 " @@ -3353,5 +3675,5 @@ "lat=y&lon=x&zoom=z eller ett filnamn" -#: ../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 " @@ -3361,5 +3683,5 @@ "lat=y&lon=x&zoom=z eller ett filnamn" -#: ../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 " @@ -3369,75 +3691,94 @@ "eller en URL som returnerar osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "valfri" -#: ../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 "Om angivet så återställ konfigurationen istället för att läsa in den." -#: ../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 "Användarnamn" -#: ../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 "Lösenord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "användning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "alternativ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Visa denna hjälptext" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standard unix-geometri-argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Hämta hem området inom gränsvärdena" -#: ../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 "Hämta platsen som anges i url:en (med 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 "Öppna fil (som rå gps, om .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 "Hämta området innanför gränsvärden som rå 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 "Gör urval med angivet sökkriterium" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Öppna i maximerat läge" -#: ../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 "Återställ inställningarna till förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Ange språk" -#: ../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 "exempel" -#: ../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" @@ -3447,47 +3788,47 @@ "data innan --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 "Istället för --download= kan du använda 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 "Aktiverar uppdaterade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Hämtar tidiga insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Anger förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Verktyg" -#: ../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 "Snabbval" -#: ../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 @@ -3499,21 +3840,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 "Trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Växla trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Fullskärm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Växla mellan fullskärmsläge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Ljud" @@ -3553,58 +3894,44 @@ msgstr "Zooma ut" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "skala" -#: ../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 "Den geografiska longituden vid muspekaren." -#: ../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 "Namnet på objektet vid muspekaren." -#: ../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 "Den geografiska latituden vid muspekaren." -#: ../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 "Vinkeln mellan föregående och pågående delsträcka." -#: ../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 "Kompassriktning för den delsträcka som ritas." -#: ../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 "Längden hos den nya delsträcka som håller på att ritas." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(inget objekt)" -#: ../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 "lagret finns inte i listan." -#: ../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 "" - -#: ../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 "" @@ -3616,10 +3943,4 @@ msgid "File not found" msgstr "Filen hittades inte" - -#: ../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 @@ -3678,7 +3999,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" @@ -3694,5 +4014,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" @@ -3795,5 +4115,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 "" @@ -3804,5 +4124,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" @@ -3816,5 +4136,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 "" @@ -3889,6 +4209,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" @@ -3998,10 +4318,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 "" @@ -4010,19 +4330,19 @@ msgstr "" -#: ../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 "Ja, återskapa dem också" -#: ../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 "Nej, avbryt" -#: ../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 "" @@ -4033,5 +4353,5 @@ "raderade på servern.

Vill du återskapa dessa noder också?" -#: ../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 "Återskapa ytterligare noder?" @@ -4049,9 +4369,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 " @@ -4059,110 +4379,112 @@ 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 "raderad" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4171,21 +4493,21 @@ msgstr "" -#: ../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 "Roll" #: ../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 "" @@ -4224,10 +4546,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 @@ -4236,10 +4559,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 @@ -4253,5 +4577,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}" @@ -4292,4 +4616,140 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "inget" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "alla" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Välj en färg" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parametern ''{0}'' får inte vara 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 "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {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 +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 "Inte implementerat ännu." + +#: ../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 "från sträcka" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Datakonflikter" + +#: ../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} sträcka" +msgstr[1] "{0} sträckor" + +#: ../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} relation" +msgstr[1] "{0} relationer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Ändra upplösning" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Jämka konflikter" + +#: ../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 "Klistra in" + +#: ../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} sträcka" +msgstr[1] "{0} sträckor" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4305,10 +4765,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 @@ -4316,5 +4776,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}" @@ -4346,36 +4806,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 "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../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 "" @@ -4387,150 +4841,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 "Historik" -#: ../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 "Visa historik för alla valda poster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Lager: {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 "Relationer: {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 "" - -#: ../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 "Läs om alla de nu valda objekten och uppdatera listan." #. 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 "Lager" -#: ../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 "Öppna en lista av alla inlästa lager." -#: ../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 "Ta bort valt lager." -#: ../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 "Ta bort lager" - -#: ../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 "" - -#: ../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 "Visa/Dölj" -#: ../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 "Alternera visning av det valda lagret." -#: ../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 "Flytta det valda lagret en rad upp." -#: ../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 "Flytta det valda lagret en rad ner." -#: ../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." @@ -4539,28 +4961,22 @@ msgstr[1] "Detta kommer att ändra upp till {0} objekt." -#: ../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 "Om värdet är tomt tas nyckeln bort." -#: ../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 "Ändra värden?" -#: ../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" @@ -4569,89 +4985,84 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt." -#: ../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 "Välj en nyckel" -#: ../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 "Välj ett värde" -#: ../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 "Välj de objekt vars egenskaper du vill ändra." -#: ../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 "Egenskaper/Roller" -#: ../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 "Egenskaper för valda objekt." #. 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 "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Lägg till egenskaper" -#: ../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 "Lägg till" -#: ../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 "Lägg till ett nytt nyckel/värde-par till alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Redigera egenskaper" -#: ../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 "Redigera värdet av den valda nyckeln för alla objekt." -#: ../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 "Egenskaper: {0} / Medlemskap: {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 "Egenskaper / Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Ändra relation" -#: ../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 "Verkligen ta bort det valda från relation {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 "Ta bort den valda nyckeln från alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Ta bort egenskaper" @@ -4660,34 +5071,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 "Relationer" -#: ../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 "Öppna en lista över alla relationer" -#: ../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 "Relationer: {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 "Öppna en redigerare för den valda relationen" -#: ../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 "Ta bort den valda relationen" -#: ../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 "Skapa en ny relation" -#: ../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 "" @@ -4720,23 +5131,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 "Markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} sträcka" -msgstr[1] "{0} sträckor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relation" -msgstr[1] "{0} relationer" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4744,14 +5141,9 @@ msgstr "Urval: {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 "Lossa panelen" -#: ../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." @@ -4760,64 +5152,98 @@ "vänstra verktygraden." -#: ../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 "Klicka för att minimera/maximera panelens innehåll" -#: ../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 "Upphovsmän" -#: ../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 "Öppna en lista över de som arbetar med de valda objekten." -#: ../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] "Upphovsman" +msgstr[1] "Upphovsman" + +#: ../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 +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 "Mer information om denna funktion" + +#: ../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 "" +"VARNING: Öppnar webbläsare endast för de första {0} utav {1} markerade " +"primitiven." + +#: ../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 "Upphovsman" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Upphovsmän: {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 "Datakonflikter" -#: ../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 "" @@ -4826,47 +5252,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 " @@ -4875,14 +5295,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 "" @@ -4892,9 +5312,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 "" @@ -4904,15 +5324,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4920,5 +5340,5 @@ msgstr "" -#: ../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 " @@ -4926,20 +5346,20 @@ msgstr "" -#: ../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 "" @@ -4948,57 +5368,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 "Flytta vald medlem/valda medlemmar uppåt" #. 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 "Flytta vald medlem/valda medlemmar nedåt" #. 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 " @@ -5007,9 +5427,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 "" @@ -5018,20 +5438,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 @@ -5041,37 +5457,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 "Hämta alla ofullständiga sträckor och noder i relationen" -#: ../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 "Hämta medlemmar" -#: ../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 "" @@ -5081,30 +5497,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 "" @@ -5118,22 +5534,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 "Hämtar tidiga insticksmoduler" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5166,34 +5587,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] "Ta bort gamla nycklar för upp till {0} objekt" -msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bokmärken" -#: ../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 "Ange först önskade koordinater." -#: ../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 "Ange platsens namn." -#: ../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 "Välj ett bokmärke först." @@ -5250,13 +5658,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 "Ange en söksträng" -#: ../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 "Kan inte läsa sökresultat för plats från servern" @@ -5264,18 +5672,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 "Ange ett platsnamn att söka efter:" -#. 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 "Platser" #. 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 "namn" @@ -5314,37 +5721,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 "typ" -#: ../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 "nära" -#: ../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 "zooma" -#: ../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: " @@ -5353,5 +5760,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 "Glidande karta" @@ -5378,47 +5785,75 @@ msgstr "Rutnummer" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "raderar referens från relation {0}" + +#: ../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 "Skicka in inställningar till servern" + +#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "raderar referens från relation {0}" #. item "Streets/Motorway" text "Reference" @@ -5736,14 +6171,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5919,8 +6368,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" #. @@ -6017,4 +6472,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6128,6 +6586,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 @@ -6135,153 +6593,171 @@ #: 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 "Namn" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Ändra relation" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Mer information om denna funktion" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Senast ändrad {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6290,32 +6766,287 @@ msgstr "" -#: ../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 "Gatunamn" + +#: ../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 "Välj ett värde" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parametern ''{0}'' får inte vara null" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Korrigera taggkonflikter" + +#: ../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] "" + +#: ../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] "" + +#: ../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 "Kassera och avsluta" + +#: ../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 "Spara och avsluta" + +#: ../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 "Lager" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Vid inskickning" + +#: ../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 "Arkiv" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Ladda Upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Det finns inga markerade primitiv att uppdatera." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Bilder för {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 "Läs in 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 "Tid saknas för punkt {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 "Kan inte lästa tidpunkt \"{0}\" från punkt {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 "Inga bilder med läsbara tidsangivelser hittades." -#: ../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 @@ -6323,29 +7054,29 @@ msgstr "Läser {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 "Geotaggade bilder" -#: ../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 startpunkt: {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 slutpunkt: {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 "nuvarande delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "tidsskillnad: " -#: ../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" @@ -6354,14 +7085,14 @@ msgstr[1] "bilder" -#: ../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} inom spåret." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synka klocka" -#: ../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 @@ -6369,82 +7100,82 @@ msgstr "JPEG-bilder (*.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 "Datum i fil \"{0}\" kunde inte tolkas." -#: ../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 "Det finns inte någon EXIF-tid i filen\"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Bild" -#: ../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 "Ange visat datum (mm/dd/yyyy HH:MM:SS)" -#: ../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 "Tidszon för GPS-enhet (skillnad mot foto)" -#: ../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 "Synkronisera Tid med GPS-enheten" -#: ../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 "Angiven tid kunde inte tolkas." -#: ../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-punkt" -#: ../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 "Anpassa linjeritning" +#: ../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 "Använd globala inställningar" + #: ../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 "Använd globala inställningar" +msgid "Draw lines between points for this layer." +msgstr "Rita linjer mellan punkter i detta lager." #: ../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 "Rita linjer mellan punkter i detta lager." - -#: ../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 "Rita inte linjer mellan punkter i detta lager." -#: ../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 "Välj alternativ för linjeritning" -#: ../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 "Anpassa färger" -#: ../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 "Standard" -#: ../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" @@ -6504,5 +7235,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}" @@ -6518,10 +7249,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 "Omvandla till datalager" #: ../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." @@ -6532,11 +7263,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 @@ -6578,4 +7309,9 @@ "Önskar du
fortsätta?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Hämtar data" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6598,64 +7334,64 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../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 "Datalager {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 "utanför hämtat område" -#: ../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 "" -#: ../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 "" -#: ../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} består av:" -#: ../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} raderad.)" -#: ../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 "" -#: ../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 "Omvandla till gpx-lager" -#: ../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" @@ -6663,5 +7399,5 @@ msgstr[1] "spår" -#: ../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" @@ -6669,5 +7405,5 @@ msgstr[1] "punkter" -#: ../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" @@ -6676,5 +7412,5 @@ msgstr[1] "ett spår med {0} punkter" -#: ../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" @@ -6683,5 +7419,5 @@ msgstr[1] "{0} består av {1} spår" -#: ../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" @@ -6690,9 +7426,9 @@ msgstr[1] "{0} punkter" -#: ../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-markör" -#: ../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" @@ -6700,5 +7436,5 @@ msgstr[1] "markörer" -#: ../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" @@ -6717,5 +7453,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}." @@ -6723,5 +7459,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 "Det går inte att synkronisera i det lager som spelas upp." @@ -6751,5 +7487,5 @@ msgstr "Växla visning av markörtext och ikoner." -#: ../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 " @@ -6757,5 +7493,5 @@ msgstr "" -#: ../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 " @@ -6765,29 +7501,29 @@ "spårpunkt där du vill synkronisera." -#: ../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 "Kunde inte skapa ny ljudmarkör." -#: ../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 "Fel uppstod vid visning av URL:en för denna markör." -#: ../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 "(URL:en var: " -#: ../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 "Fel vid visning av 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 "Avancerade inställningar" -#: ../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 "Ange inställningar direkt. Använd med försiktighet!" -#: ../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 @@ -6795,27 +7531,27 @@ msgstr "Sök: " -#: ../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 "Nuvarande värde är förval." -#: ../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 "Nuvarande värde är ''{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 "" "Förvalt värde är för närvarande okänt (inställningen har inte använts än)." -#: ../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 "Välj vilken rad du vill ändra." -#: ../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 @@ -6823,14 +7559,14 @@ msgstr "Nytt värde för {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 "Välj vilken rad du vill ta bort." -#: ../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 "Ange ett nytt nyckel/värde-par" @@ -6966,40 +7702,40 @@ msgstr "Kalibrering av röstinspelare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Färg" -#: ../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 "Ritstil{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 "Lager: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Välj" -#: ../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 "Välj en färg för {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 "Sätt till förval" -#: ../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 "Sätt allt till förval" -#: ../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 "De färger som används av olika objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Färger" @@ -7043,5 +7779,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Bil" @@ -7063,16 +7799,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 "Cykel" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7102,12 +7839,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 "Fotgängare" @@ -7291,5 +8028,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 "Visa startbild vid uppstart" @@ -7297,23 +8034,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 "Visa objektens ID i urvalslistor" #: ../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 "Visa objektens ID i urvalslistor" + +#: ../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 "Rita gummibandshjälplinjer" -#: ../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 "Arbeta utan lägen (Potlatch-stil)" -#: ../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 "Visa objektens ID i urvalslistor" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Kräv inte att man byter läge (arbetsflöde som i 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 "Utseende och känsla" @@ -7345,54 +8093,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 "Ställ in tillgängliga insticksmoduler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Hämta lista" -#: ../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 "Uppdatera" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Konfigurera hämtställen..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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 "Välj en post." +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Konfigurera hämtställen för insticksmoduler" #. 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 "Visningsinställningar" -#: ../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 " @@ -7401,42 +8149,42 @@ "Olika inställningar som påverkar hur hela programmet representeras visuellt." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Anslutningsinställningar" -#: ../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 "Anslutningsinställningar för OSM-servern" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Kartinställningar" -#: ../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 "Inställningar för kartprojektion och datatolkning." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Ljudinställningar" -#: ../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 "Inställnignar för ljudspelare och ljudmarkörer." -#: ../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 "" "Du behöver starta om JOSM för att vissa inställningar skall slå igenom." -#: ../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 "Visa koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projektionsmetod" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Kartprojektion" @@ -7469,12 +8217,4 @@ msgid "Proxy server password" msgstr "Lösenord för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Bas-URL för OSM-servern (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Bas-URL för servern" #. 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 @@ -7501,61 +8241,60 @@ msgstr "Kortkommando" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "Välj vilken rad du vill kopiera." -#: ../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 "" -#: ../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 "Ta bort vald källa från listan." -#: ../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 "" @@ -7749,36 +8488,59 @@ msgstr "Modifierargrupper" -#: ../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] "Ta bort gamla nycklar för upp till {0} objekt" +msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Lägg till ett nytt lager" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Ta bort valt lager." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Mer information om denna funktion" #. 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 "Valfria attribut:" -#: ../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 "Använd snabbvalet ''{0}'' i gruppen ''{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 "Använd snabbval ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "slutenväg" -#: ../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 "Okänd typ: {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 @@ -7786,15 +8548,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {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 "Fel vid tolkning {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 "Objekt av typ {0} stöds." -#: ../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 @@ -7804,22 +8566,22 @@ msgstr[1] "Ändra {0} objekt" -#: ../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 "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Ändra egenskaper" -#: ../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}''" @@ -7858,11 +8620,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 "Kunde inte öppna \"{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 " @@ -7872,38 +8634,38 @@ "licens." -#: ../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 "GPX-filer" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "beskrivning av gps-spår" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Lägg till information om upphovsman" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Namn" -#: ../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 "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Fördefinierad" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Copyrightår" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Nyckelord" @@ -7913,9 +8675,9 @@ msgstr "Exportalternativ" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exportera och spara" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7926,10 +8688,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 "Välj en fördefinierad licens" -#: ../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 @@ -7939,12 +8701,12 @@ msgstr "Markörer från {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 "" -#: ../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" @@ -7965,6 +8727,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 @@ -7974,20 +8736,40 @@ msgstr "Hämtar OSM-data..." -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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 "Urvalet utökades inte genom att söka efter ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7995,34 +8777,34 @@ msgstr "" -#: ../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-filer" -#: ../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 "Koordinater importerade: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Felaktigt utformade meningar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Checksum-fel: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Okända meningar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Nollkoordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Import från NMEA genomförd" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Import från NMEA misslyckades!" @@ -8033,9 +8815,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8044,15 +8826,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8060,33 +8842,91 @@ msgstr "" -#: ../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 "Öppnar ändringssamling..." -#: ../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 "Öppnar ändringssamling..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Öppnar ändringssamling..." + +#: ../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 "Öppnar ändringssamling..." + +#: ../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 "Stänger ändringssamling..." -#: ../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 "Stänger ändringssamling..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Öppnar ändringssamling..." + +#: ../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 "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Skickar in..." -#: ../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}." @@ -8114,29 +8954,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Felaktigt lösenord eller användarnamn." -#: ../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 "Varning: Lösenordet skickas okrypterat." -#: ../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 "Spara användare och lösenord (okrypterat)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Ange lösenord" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Logga in" -#: ../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 "Bas-URL för OSM-servern (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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." @@ -8144,13 +8988,17 @@ "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Bas-URL för servern" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM-lösenord" -#: ../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." @@ -8159,20 +9007,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM serverfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8181,5 +9029,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8373,35 +9221,46 @@ "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning." -#: ../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} kvar. Skickar in {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} kvar. Skickar in {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} kvar. Skickar in {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 "Det finns inte någonting att skicka in. Skaffa lite data först." + +#: ../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 "Uppdatera insticksmoduler" -#: ../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 "Hämta insticksprogram" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8415,5 +9274,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." @@ -8422,23 +9281,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8449,15 +9308,15 @@ msgstr "Fel uppstod i insticksmodulen {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 "" -#: ../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." @@ -8466,15 +9325,15 @@ "inte hittas." -#: ../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 "Insticksmodulen kunde ej hittas: {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 "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan." -#: ../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 " @@ -8484,12 +9343,12 @@ "med hjälp av inställningen '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 "Avaktivera insticksmodul" -#: ../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?" @@ -8498,9 +9357,9 @@ "inställningarna?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Behåll plugin" -#: ../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 " @@ -8510,5 +9369,5 @@ "JOSM har behörighet att skriva över de existerande." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8517,10 +9376,10 @@ "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{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 "Enligt information inifrån insticksmodulen är dess upphovsman {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." @@ -8529,9 +9388,9 @@ "innan du rapporterar en bugg." -#: ../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 "Skall insticksmodulen avaktiveras?" -#: ../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 " @@ -8541,13 +9400,13 @@ "frigöra insticksmodulen." -#: ../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" @@ -8558,5 +9417,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" @@ -8565,18 +9424,18 @@ msgstr[1] "Hämtade information om insticksmoduler från {0} ställen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Kunde inte hitta någon information om insticksmoduler." -#: ../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 "" -#: ../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 "Alla installerade insticksmoduler är av senaste version." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8589,9 +9448,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 "Hämta saknade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8604,35 +9463,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}: Version {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 "Insticksmodul som medföljer 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 "Fel vid inläsning av informationsfil för insticksmodul: {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 "Detta är slutet av inspelningen" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Fel vid uppspelning av ljud" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Gör ingenting" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Rapportera en bugg" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8646,14 +9505,14 @@ "lämna in en felrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Oväntat undantag" -#: ../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 "Lämna in en rapport på {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 "" @@ -8661,5 +9520,5 @@ "möjligt)!" -#: ../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 " @@ -8669,13 +9528,13 @@ "versionen av JOSM och alla insticksmoduler." -#: ../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 "Följande information måste finnas med:" -#: ../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 "(Texten finns redan i urklipp.)" -#: ../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}." @@ -8683,6 +9542,6 @@ "Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {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 "" @@ -8691,5 +9550,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8698,5 +9557,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8710,5 +9569,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" @@ -8718,5 +9577,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8727,21 +9586,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 "(Tips: Du kan själv välja kortkommandon i inställningarna.)" -#: ../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 "" @@ -8768,9 +9662,27 @@ msgstr "Skapa ett rutnät av sträckor" -#: ../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 "Skicka in spår" -#: ../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 @@ -8778,27 +9690,40 @@ msgstr "Skicka in spår" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Publik" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Om vald så är dina spår öppna för allmänheten på 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 "Beskrivning" -#: ../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 "Ange beskrivning för ditt spår." -#: ../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}" @@ -8806,47 +9731,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 "Ansluter..." -#: ../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 "Inskickning avbruten" -#: ../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 "Fel vid inskickning" -#: ../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-inskickning genomförd" -#: ../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 "Inskickning misslyckades. Servern returnerade följande meddelande: " -#: ../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 "Skickar in GPX-spår: {0}% ({1} av {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 "Ingen beskrivning angiven. Skriv in en beskrivning." -#: ../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 "Inget GPX-lager valt. Kan inte skicka in ett spår." -#: ../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 "Inget användarnamn angivet." -#: ../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 "Inget lösenord angviet." -#: ../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 "Skickar in GPX-spår" @@ -8959,19 +9884,19 @@ msgstr "Hämta en uppsättning bilder som ett nytt lager." -#: ../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-filer" -#: ../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 "Filen {0} är fortfarande aktiv under namnet \"{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 "Fel vid tolkning {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." @@ -8983,34 +9908,34 @@ "välj en tidzon
" -#: ../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 "Fototid (från 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-tid (läst från fotot ovan): " -#: ../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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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 "Jag är i följande tidzon: " -#: ../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 "Inget datum" -#: ../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 "Öppna ett annat foto" -#: ../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 "Synkronisera tid med hjälp av ett foto av GPS-mottagaren" -#: ../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" @@ -9020,29 +9945,29 @@ "Använd begärt format" -#: ../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 "Ogiltigt datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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-spår: " -#: ../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 "Öppna ett annat foto" -#: ../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 "Tidszon: " -#: ../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 "Förskjutning:" -#: ../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 "" @@ -9050,41 +9975,41 @@ "" -#: ../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 "Uppdatera position för: " -#: ../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 "Alla bilder" -#: ../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 "Bilder utan positionsangivelse i 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 "Bilder som inte taggats ännu" -#: ../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 "Sätt bilder i relation till GPX-spår" -#: ../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 "Korrelera" -#: ../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 "Auto-gissa" -#: ../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 "Välj ett GPX-spår" -#: ../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 "Inget GPX-spår har valts" -#: ../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 "" @@ -9095,9 +10020,9 @@ "Förväntat format: {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 "Ogiltig tidszon" -#: ../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 "" @@ -9108,26 +10033,26 @@ "Förväntat format: {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 "Ogiltig förskjutning" -#: ../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 "Hittade {0} träffar för {1} i GPX-spår {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-spår har hämtats" -#: ../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 "De markerade fotografierna innehåller ingen tidsinformation." -#: ../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 "Fotografierna innehåller ingen tidsinformation." -#: ../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." @@ -9135,39 +10060,39 @@ "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." -#: ../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-spåret saknar tidsinformation" -#: ../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 "Tidszon: {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 "Minuter: {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 "Sekunder: {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 "Parade ihop {0} av {1} foton med GPX-spåret" -#: ../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 "(Tidsdifferens om {0} dagar)" -#: ../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 "Förskjutning mellan spår och foton: {0}m {1}s" -#: ../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 " @@ -9175,13 +10100,13 @@ msgstr "" -#: ../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 "Matchning av fotografier mot spår misslyckades" -#: ../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 "Justera tidszon och tidsförskjutning" -#: ../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 "Standardinställningar" @@ -9202,5 +10127,5 @@ msgstr "Fel i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9213,12 +10138,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 "Välj allt" - -#: ../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 "Fel vid läsning av fil" @@ -9247,8 +10171,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 "" "Stad/ort {0} kunde inte hittas i WMS.\n" @@ -9259,21 +10183,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 "Välj commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Välj en av..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../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" @@ -9282,37 +10206,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 "Ersätt originalets bakgrund med JOSM:s bakgrundsfärg." -#: ../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 "Gör bakgrunden genomskinlig." -#: ../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 "Rita gränser för hämtade data." -#: ../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 "Aktivera automatisk cachning." -#: ../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 "Största tillåtna cachestorlek (MB)" -#: ../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." @@ -9324,9 +10259,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "Fransk Cadastre-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 "" @@ -9334,10 +10269,10 @@ "källa är aktiverat." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Källa" -#: ../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 " @@ -9347,5 +10282,5 @@ "JOSM:s inställningar." -#: ../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). " @@ -9355,41 +10290,39 @@ "gråtoner). Användbart för text på mörka bakgrunder." -#: ../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 "" -#: ../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 "Rita en rektangel runt data nedladdad från WMS-servern." #. 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 "Multiplikator för snabbspolning framåt" - -#: ../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 "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)" -#: ../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 "" -#: ../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 "" -#: ../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 "Multiplikator för snabbspolning framåt" - -#: ../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 "Äldsta filerna raderas automatiskt när denna storlek överskrids" @@ -9445,12 +10378,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Kontaktar WMS-servern..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "bilden har inte hämtats" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9484,20 +10415,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" @@ -9505,9 +10436,14 @@ 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 +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" @@ -9515,31 +10451,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 "Ange lat/lon för att gå direkt till plats." - -#: ../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 "öster" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "norr" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Nollkoordinater: " +msgid "Set " +msgstr "Markera" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9601,6 +10545,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)" @@ -9622,6 +10566,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 "Tomt lager" @@ -9637,7 +10581,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Rastercenter: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10162,6 +11106,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 "vatten" @@ -10174,8 +11118,4 @@ msgid "land" msgstr "land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "inget" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10470,9 +11410,9 @@ msgstr "Hämtningsloop för 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 "Visar problemfall från 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 " @@ -10481,5 +11421,5 @@ msgstr "" -#: ../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 "" @@ -11053,5 +11993,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 "Gatunamn" @@ -11070,29 +12010,29 @@ msgstr "Visa upphovsmannafönstret" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Öppna användarsida" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Öppna användarens sida i en webbläsare" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Välj användardata" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Ersätter urvalet med användarens data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Välj några data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Välj en användare m h a upphovsmannafönstret" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Det fungerar tyvärr inte med anonyma användare" @@ -11106,25 +12046,15 @@ msgstr "Förena ytor som överlappar varandra" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du skickar " -"in det." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Fortsätt ändå" - -#: ../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 "För närvarande kan enbart upp till två ytor förenas." -#: ../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}\" är inte sluten, och kan därför inte förenas med andra ytor." -#: ../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" @@ -11137,38 +12067,38 @@ "Är du säker på att du vill fortsätta?" -#: ../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 "Avbryt om du är osäker" -#: ../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 "Välj åtminstone en sluten väg som skall förenas." -#: ../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 "La till nod vid alla korsande sträckor" -#: ../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 "Ta bort sträckor som inte är del av en inre multipolygon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Korrigera relationer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Slog ihop område som låg ovanpå sig själv" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Slog ihop områden som låg ovanpå varandra" -#: ../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 " @@ -11178,82 +12108,82 @@ "att det inte har uppstått några fel." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Korrigera taggkonflikter" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Tog bort element från relation" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Slå ihop områden: Ta bort korta sträckor" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Sluten sträcka" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Ta bort taggar från inre sträckor" -#: ../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 "Gå till plats" -#: ../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 "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Ange lat/lon för att gå direkt till plats." -#: ../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 "Du kan också klistra in en URL från www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoomnivå (meter)" -#: ../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 "Gå direkt dit" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Gå direkt till plats" -#: ../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 "" "Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Kunde inte tolka lon/lat" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Förenkla sträcka" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Ta bort onödiga noder från en sträcka." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Välj åtminstone en sträcka att förenkla." -#: ../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?" @@ -11266,25 +12196,25 @@ "alla?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Är du säker?" -#: ../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 "Valideringsfel" -#: ../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 "Inga valideringsfel" -#: ../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 "Rutnät" -#: ../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 "" @@ -11375,53 +12305,53 @@ msgstr "Utför datavalidering" -#: ../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 "Data med fel. Skicka in ändå?" -#: ../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 "Öppna valideringslistan" -#: ../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 "Zooma till problem" -#: ../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 "Rätta till" -#: ../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 "Rätta till de valda felen" -#: ../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 "Ignorera" -#: ../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 "Ignorera de valda felen nästa gång." -#: ../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 "Hela gruppen" -#: ../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 "Enstaka poster" -#: ../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 "Ingenting" -#: ../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 "Ignorera hela gruppen eller enstaka poster?" -#: ../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 "Ignorerar poster" -#: ../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" @@ -11445,24 +12375,58 @@ #: ../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 "" "Detta test kontrollerar om två vägar, järnvägar eller vattendrag korsar " "varandra i samma lager, men inte förenas med en nod." -#: ../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 "Skapa byggnader" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Korsande sträckor" -#: ../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 "Dubbletter av noder" -#: ../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 "" "Detta test kontrollerar att det inte finns några noder med precis samma läge." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Noder med samma namn" + +#: ../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 "Dubblera sträcka" + +#: ../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 "" +"Detta test kontrollerar att det inte finns några noder med precis samma läge." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Skapa en dubblett av sträcka" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11551,23 +12515,23 @@ "felstavning." -#: ../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 "Egenskapskontrollerare:" -#: ../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 "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden." -#: ../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 "Ogiltig taggkontrollsrad - {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 "Ogiltig rättstavningsrad: {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 "" @@ -11578,7 +12542,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 "Ogiltig kombination av nyckel och värde" @@ -11586,80 +12550,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 "Ritningsproblem" -#: ../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 "Nyckeln ''{0}'' är ogiltig." -#: ../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 "Taggar med tomma värden" -#: ../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 "Ogiltig egenskapsnyckel" -#: ../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 "Egenskapsnyckel innehåller ogiltigt blanksteg" -#: ../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 "Egenskapsvärdet börjar eller slutar med blanksteg" -#: ../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 "Det finns en HTML-markör i egenskapsvärdet" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "FIXME-taggar" -#: ../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 "Kontrollera egenskapsnycklar" -#: ../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 "Validera egenskapsnycklar genom att kontrollera mot en lista av ord." -#: ../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 "Använd komplicerad egenskapskontroll." -#: ../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 "Validera egenskapsvärden och taggar med hjälp av komplicerade regler." +#: ../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 "Källa för 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." @@ -11670,84 +12634,84 @@ "taggkontrollera datafiler." -#: ../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 "Lägg till en ny källa till listan." -#: ../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 "Redigera vald källa." -#: ../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 "Datakällor" -#: ../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 "Kontrollera egenskapsvärden" -#: ../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 "" "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar." -#: ../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 "Leta efter FIXME-taggar." -#: ../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 "" "Letar efter noder och sträckor som har texten FIXME i något egenskapsvärde." -#: ../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 "Kontrollera om det finns ritningsanmärkningar." -#: ../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 "Kontrollera om problem uppstod vid ritning av kartan" -#: ../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 "Använd förvald datafil." -#: ../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 "Använd den förvalda datafilen (rekommenderas)." +#: ../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 "Använd förvalda rättstavningsfil." -#: ../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 "Använd den förvalda rättstavningsfilen (rekommenderas)." -#: ../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 "Rätta till egenskaper" -#: ../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 "Kunde inte hitta elementtyp" -#: ../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 "Kunde inte hitta varningsnivå" -#: ../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 "Ogiltigt uttryck ''{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}''" @@ -11892,7 +12856,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 "byggnad (building)" @@ -11906,5 +12870,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 "yta (area)" @@ -12048,5 +13012,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Undantag inträffade" @@ -12091,14 +13055,14 @@ msgstr "Hjälp om WMS-insticksmodulen" -#: ../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 "Korrigerad bild..." -#: ../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}" @@ -12109,26 +13073,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 "" -#: ../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 "" -#: ../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 " @@ -12136,37 +13100,55 @@ msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Justera 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 "Justera valt WMS-lagers läge" -#: ../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 "" @@ -12179,105 +13161,144 @@ msgstr "Automatisk hämtning" -#: ../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 "avsedd för" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {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-lager ({0}), hämtas i zoomläge {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 "Ogiltigt datum" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Hämta WMS-lager från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Fel filformat" -#: ../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 "Öppna ett tomt WMS-lager för att läsa in data från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Inställningar för WMS-insticksmodulen" -#: ../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 "" "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen" -#: ../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 "Menynamn" -#: ../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 "URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Menynamn (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS-url (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Ange ett menynamn och en URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Kopiera förval" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Välj åtminstone en sträcka." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12642,62 +13663,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 "Referens" - -#. 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 "Lager" #. item "Streets/Motorway" combo "Layer" @@ -12712,5 +13678,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 "Filer" @@ -12725,5 +13691,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" @@ -12733,10 +13698,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 "Största tillåtna hastighet (km/h)" @@ -12780,9 +13745,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 "Enkelriktat" @@ -12830,13 +13795,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 "Bro" @@ -12878,13 +13843,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 "Tunnel" @@ -12924,12 +13889,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 "Skärning" @@ -12969,12 +13934,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 "Bank" @@ -13130,17 +14095,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 "Bredd (meter)" @@ -13167,4 +14132,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" @@ -13183,11 +14149,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 "Yta" @@ -13197,4 +14164,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" @@ -13209,9 +14177,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 "belagd" @@ -13219,10 +14188,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 "obelagd" + +#: 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 "Fäbod" + +#: 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 "Uthyrning" + +#. 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 "skog" + +#: 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 "parkeringsbiljetter" #. item "Ways/Track Grade 2" combo "Surface" @@ -13230,12 +14262,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 "kullersten" + +#: 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 "grus" + +#: 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 "kullersten" + +#: 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 "ofullständig" + +#: 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 "gräs" + +#: 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 "gräs" + +#: 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 "sand" + +#. 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)" @@ -13316,20 +14430,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Vägbegränsningar" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Redigera vägbegränsningar" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Betalstation" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Återvändsgränd" @@ -13342,8 +14456,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 "" @@ -13378,32 +14492,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 "ja" @@ -13416,40 +14545,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 "privat" -#: 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 "avsedd för" @@ -13462,19 +14591,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 "mål" @@ -13497,65 +14626,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 "med tillåtelse" -#: 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 "jordbruksfordon" -#: 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 "nej" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Lätt lastbil" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Tung lastbil" @@ -13570,10 +14704,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 "Häst" @@ -13589,17 +14723,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 "Motorcykel" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13611,30 +14744,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 "Bil" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Allmänna transportmedel (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorbåt" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Båt" #. 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 "Minsta tillåtna hastighet (km/h)" @@ -13642,25 +14775,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 "Största tillåtna vikt (ton)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Största tillåtna höjd (meter)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Största tillåtna bredd (meter)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Största tillåtna längd (meter)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rondell" @@ -13671,5 +14804,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 "Redigera en korsning" @@ -13685,5 +14818,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" #. @@ -13691,9 +14824,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 "Typ" @@ -13713,10 +14846,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 "motorväg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorvägslänk" @@ -13738,10 +14871,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 "stamväg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "stamvägslänk" @@ -13763,10 +14896,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 "primärväg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "primärvägslänk" @@ -13788,5 +14921,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" @@ -13801,9 +14934,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "tertiärväg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "oklassificerad" @@ -13817,9 +14950,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "bostadsgata" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "gårdsgata" @@ -13849,10 +14982,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 "tillfartsväg" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "buss_spårväg" @@ -13882,6 +15015,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 "under byggnad" @@ -13892,10 +15025,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 "Redigera en bro" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Redigera en tunnel" @@ -13903,19 +15036,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Stigar och småvägar" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Under byggnad" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Redigera en väg under byggnad" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Korsning" @@ -13931,5 +15064,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rondell" @@ -13938,5 +15071,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Gång-/Ridstig" @@ -13944,5 +15077,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Redigera en gång-/ridstig" @@ -13950,5 +15083,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Cykelbana" @@ -13958,11 +15091,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 "Redigera en cykelbana" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Gågata" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Gångstig" @@ -13971,11 +15110,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Redigera en gångstig" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Spikhinder" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Gågata" @@ -13984,5 +15129,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Redigera en gågata" @@ -13990,5 +15135,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Trappsteg" @@ -13998,5 +15143,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 "Redigera en trappa" @@ -14005,5 +15150,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Bruksväg" @@ -14012,39 +15157,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Redigera en bruksväg" -#: 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 "grus" - -#. 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 "gräs" - -#: 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 "sand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Bruksväg klass 1" @@ -14053,5 +15170,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Redigera en bruksväg klass 1" @@ -14059,5 +15176,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Bruksväg klass 2" @@ -14066,5 +15183,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Redigera en bruksväg klass 2" @@ -14072,5 +15189,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Bruksväg klass 3" @@ -14079,5 +15196,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Redigera en bruksväg klass 3" @@ -14085,5 +15202,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Bruksväg klass 4" @@ -14092,5 +15209,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Redigera en bruksväg klass 4" @@ -14098,5 +15215,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Bruksväg klass 5" @@ -14105,5 +15222,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Redigera en bruksväg klass 5" @@ -14112,5 +15229,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Stig" @@ -14119,19 +15236,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Redigera en stig" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Skidor" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Snöskoter" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Skidor" - #. 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 "Vandringsled" @@ -14141,5 +15261,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 "Redigera en vandringsled" @@ -14147,5 +15267,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Bergsvandringsled" @@ -14155,5 +15275,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 "Redigera en bergsvandringsled" @@ -14161,5 +15281,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Krävande bergsvandringsled" @@ -14169,5 +15289,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 "Redigera en krävande bergsvandringsled" @@ -14175,5 +15295,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Fjällvandringsled" @@ -14183,5 +15303,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 "Redigera en fjällvandringsled" @@ -14189,5 +15309,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Krävande fjällvandringsled" @@ -14197,5 +15317,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 "Redigera en krävande fjällvandringsled" @@ -14203,5 +15323,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Svår fjällvandringsled" @@ -14211,5 +15331,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 "Redigera en svår fjällvandringsled" @@ -14217,10 +15337,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Vägpunkter" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Motorvägskorsning" @@ -14228,15 +15348,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Redigera en motorvägskorsning" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "" @@ -14244,5 +15364,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "" @@ -14256,4 +15376,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" #. @@ -14273,18 +15395,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 "Operatör" @@ -14293,5 +15417,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Trafikljus" @@ -14301,5 +15425,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Typ av övergångsställe" @@ -14308,27 +15432,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 "obevakad" -#: 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 "trafikljus" -#: 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 "utan markering" #. 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 "Korsa ridande" @@ -14336,6 +15460,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 "Korsa cyklande" @@ -14344,11 +15468,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 "Brittiskt namn på övergångsställe" @@ -14356,30 +15480,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 "övergångsställe" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelican" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stopp" @@ -14387,5 +15511,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Övergångsställe för fotgängare" @@ -14394,14 +15518,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 "Brittiskt typnamn" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Minirondell" @@ -14412,14 +15536,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 "Riktning" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "medurs" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Vändplats" @@ -14429,20 +15553,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 "Stadsgräns" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Redigera en stadsgränsskylt" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Andra namn" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Hastighetskamera" @@ -14450,5 +15574,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Nödtelefon" @@ -14456,5 +15580,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14462,5 +15586,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14469,10 +15593,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Vadställe" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Redigera ett vadställe" @@ -14480,5 +15604,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Bergspass" @@ -14486,5 +15610,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Redigera ett bergspass" @@ -14492,11 +15616,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 "Höjd" @@ -14504,5 +15628,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Hinder" @@ -14510,5 +15634,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Trafikkon" @@ -14516,5 +15640,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Redigera en trafikkon" @@ -14559,16 +15683,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 "Tillåten trafik:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "" @@ -14577,5 +15701,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "" @@ -14583,5 +15707,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Färist" @@ -14589,10 +15713,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Redigera en färist" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bussfålla" @@ -14600,15 +15724,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Spikhinder" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Redigera spikhinder" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Betalstation" @@ -14616,5 +15740,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Redigera betalstation" @@ -14622,10 +15746,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Gränskontroll" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Redigera en gränskontroll" @@ -14635,5 +15759,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Häck" @@ -14642,5 +15766,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Stängsel" @@ -14649,5 +15773,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mur" @@ -14655,5 +15779,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Stadsmur" @@ -14662,5 +15786,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Stödmur" @@ -14672,15 +15796,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Ingång" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Redigera en ingång" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Grind" @@ -14688,50 +15812,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Redigera en grind" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Bom" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Redigera en bom" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Taggtrådsgrind" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Redigera en taggtrådsgrind" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Fösgrind" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Redigera en fösgrind" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Manshål" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Redigera ett manshål" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Stätta" @@ -14739,25 +15863,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Redigera en stätta" #. 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 "Utfallsport" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Redigera en utfallsport" @@ -14768,10 +15892,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 "Vatten" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Källa" @@ -14779,5 +15903,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Redigera en källa" @@ -14785,5 +15909,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Avlopp" @@ -14791,10 +15915,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Redigera en avloppsränna" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Bäck" @@ -14802,10 +15926,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Redigera en bäck" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -14813,10 +15937,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Redigera en kanal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Flod" @@ -14826,5 +15950,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 "Redigera en flod" @@ -14832,15 +15956,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Redigera vatten" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Redigera land" @@ -14848,15 +15972,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Hamnbassäng" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Redigera användning av mark för hamnbassäng" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Resevoar" @@ -14864,15 +15988,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Redigera användning av mark för resevoar" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Täckt resevoar" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Redigera täckt resevoar" @@ -14880,5 +16004,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Flodbank" @@ -14887,10 +16011,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Redigera en flodbank" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Våtmark" @@ -14901,14 +16025,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 "Redigera våtmark" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "träsk" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "mosse" @@ -14922,35 +16046,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "kärr" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "vassbädd" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "saltäng" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "marskland" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangroveträsk" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Lera" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Redigera lera" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Strand" @@ -14958,20 +16082,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Redigera strand" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Bukt" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Redigera bukt" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Stup" @@ -14979,10 +16103,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Redigera stup" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Kustlinje" @@ -14990,5 +16114,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Redigera kustlinje" @@ -14996,5 +16120,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Färjelinje" @@ -15002,5 +16126,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Redigera en färjelinje" @@ -15009,5 +16133,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Varv" @@ -15015,10 +16139,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Redigera ett varv" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Docka" @@ -15026,5 +16150,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Redigera en docka" @@ -15032,5 +16156,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Damm" @@ -15038,15 +16162,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Redigera en damm" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Vattenpunkter" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Slussport" @@ -15055,5 +16179,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Överfallsdamm" @@ -15061,20 +16185,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Redigera en överfallsdamm" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Vattenfall" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Redigera ett vattenfall" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Vändplats" @@ -15083,15 +16207,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Småbåtshamn" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Redigera en småbåtshamn" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Pir" @@ -15099,10 +16223,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Redigera pir" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Färjeterminal" @@ -15110,10 +16234,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Redigera en färjeterminal" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Slip" @@ -15123,5 +16247,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 "Redigera en slip" @@ -15129,10 +16253,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Järnväg" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Järnväg" @@ -15140,5 +16264,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Redigera en järnväg" @@ -15168,8 +16292,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 "Valfria typer" @@ -15183,35 +16307,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 "bangård" -#: 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 "sidospår" -#: 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 "stickspår" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Smalspår" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Redigera en smalspårig järnväg" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "monorail" @@ -15219,45 +16343,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Redigera en monorailbana" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Museijärnväg" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Redigera en museijärnväg" -#: 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 "Tunnelbana" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Redigera en tunnebana" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Spårvagn" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Redigera en spårväg" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Spårbussväg" @@ -15265,5 +16389,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Redigera en spårbussväg" @@ -15272,14 +16396,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Järnväg utan trafik" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Redigera en järnväg utan trafik" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Nedlagd järnväg" @@ -15288,5 +16412,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Plankorsning" @@ -15295,5 +16419,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Järnvägsövergång" @@ -15303,5 +16427,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Typ av övergångsställe" @@ -15309,5 +16433,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Vändskiva" @@ -15316,10 +16440,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Linbana" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Stollift" @@ -15327,10 +16451,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Redigera en stollift" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Släplift" @@ -15338,10 +16462,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Redigera en släplift" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Linbana" @@ -15349,10 +16473,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Redigera linbana" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15360,5 +16484,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15366,5 +16490,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 "Station" @@ -15375,10 +16499,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 "Redigera station" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Bränsle" @@ -15388,9 +16512,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 "Redigera bränsle" #. 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 "Öppettider" + +#. 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" @@ -15410,106 +16763,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Redigera en parkeringsplats" #. 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 "Referensnummer" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "flervånings-" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "ytbeläggning" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "underjordisk" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Markera som slutförd" + +#. 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 "Avgift" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapacitet" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Handikappplatser" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Handikappplatser" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Handikappplatser" + +#: 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 "Biltvätt" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Redigera en biltvätt" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Affär" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Redigera bilförsäljare" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Bilverkstad" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Redigera en bilverkstad" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Uthyrning" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Redigera biluthyrning" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Bilpool" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Redigera bilpool" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Redigera en cykelparkering" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapacitet" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "ytbeläggning" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "flervånings-" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "underjordisk" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Handikappplatser" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Avgift" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Biltvätt" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Redigera en biltvätt" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Affär" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Redigera bilförsäljare" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Bilverkstad" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Redigera en bilverkstad" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Uthyrning" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Redigera biluthyrning" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Bilpool" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Redigera bilpool" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Redigera en cykelparkering" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Redigera en cykeluthyrning" @@ -15518,15 +16906,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Redigera cykelaffär" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Kollektivtrafik" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-klassificering" @@ -15534,5 +16922,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Järnvägshållplats" @@ -15540,5 +16928,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Redigera hållplats" @@ -15546,5 +16934,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Spårvagnshållplats" @@ -15553,5 +16941,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Redigera spårvagnshållplats" @@ -15559,5 +16947,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Plattform" @@ -15566,5 +16954,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Redigera plattform" @@ -15576,5 +16964,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 "Referens (spårnummer)" @@ -15582,10 +16970,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 "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Tunnelbaneingång" @@ -15594,10 +16982,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Redigera tunnelbaneingång" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rullstol" @@ -15606,5 +16994,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Bussterminal" @@ -15613,5 +17001,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Redigera en bussterminal" @@ -15619,5 +17007,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Busshållplats" @@ -15627,5 +17015,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 "Redigera en busshållplats" @@ -15634,8 +17022,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 "VIndskydd" @@ -15643,10 +17029,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Bussplattform" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Redigera en bussplattform" @@ -15654,5 +17040,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15660,5 +17046,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Redigera en taxistation" @@ -15666,5 +17052,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Flygplats" @@ -15672,15 +17058,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15689,5 +17075,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Logi" @@ -15699,5 +17085,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -15706,15 +17092,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Redigera ett hotell" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stjärnor" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motell" @@ -15722,20 +17108,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Redigera ett motell" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Pensionat" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Redigera pensionat" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Fäbod" @@ -15743,10 +17129,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Redigera fäbod" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Vandrarhem" @@ -15754,30 +17140,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Redigera ett vandrarhem" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Alphydda" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Redigera alphydda" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Husvagnscamping" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Redigera en husvagnscamping" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Campingplats" @@ -15785,10 +17171,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Redigera en campingplats" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Mat+Dryck" @@ -15799,5 +17185,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurang" @@ -15805,5 +17191,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Redigera en restaurang" @@ -15811,5 +17197,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 "Kök" @@ -15817,61 +17203,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 "italienskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "kinesiskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburgare" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "grekiskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "tyskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indiskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "lokalt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turkiskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatiskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thailändskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexikanskt" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japanskt" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Snabbmat" @@ -15879,9 +17265,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Redigera en snabbmatsrestaurang" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kafé" @@ -15889,10 +17275,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Redigera kafé" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -15900,20 +17285,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Redigera pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Redigera Biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "" @@ -15921,10 +17304,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 "Nattklubb" @@ -15932,33 +17314,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Redigera nattklubb" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turism" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Sevärdhet" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Redigera sevärdhet" -#. 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 "Öppettider" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -15966,10 +17339,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Redigera museum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -15978,10 +17350,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Redigera zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Utsiktsplats" @@ -15989,25 +17360,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Redigera utsiktsplats" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Utsiktstorn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Nöjespark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Redigera en nöjespark" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Konst" @@ -16015,5 +17385,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Redigera konstverk" @@ -16021,86 +17391,210 @@ #. 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 "Karta" #. 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 "karta" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "stadskarta" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "vandringskarta" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "cykelkarta" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stopp" + +#. 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 "gata" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "kinesiskt" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Hämta område" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Klistra in" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Stad" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "lokalt" #. 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 "Cykling" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Bergsvandringsled" + +#. 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 "Skidåkning" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "sidospår" + +#. 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 "Gränskontroll" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "nybörjare" + +#: build/trans_presets.java:1737 msgid "history" msgstr "historiskt" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "naturfenomen" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "djurliv" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "markanvändning" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Information" + +#. 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 "beskrivning av gps-spår" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Ljud" + +#. +#: 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 "Telefonnummer" + +#. 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 "Redigera vindskydd" @@ -16108,25 +17602,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 "Eldstad" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Picknickplats" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Redigera picknickplats" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historiska platser" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Slott" @@ -16135,20 +17629,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Redigera slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruiner" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Redigera ruiner" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Utgrävningsplats" @@ -16157,10 +17650,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Redigera utgrävningsplats" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Krigsskådeplats" @@ -16168,5 +17660,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Redigera krigsskådeplats" @@ -16174,15 +17666,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Redigera monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Minnesmärke" @@ -16190,45 +17682,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Redigera minnesmärke" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Vägkors" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Redigera ett vägkors" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Vägaltare" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Redigera ett vägaltare" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Nöje" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Badanläggning" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Redigera badanläggning" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Lekplats" @@ -16236,15 +17728,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Redigera lekplats" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Fiske" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Redigera fiske" @@ -16252,15 +17744,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sportfaciliteteter" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Redigera stadion" @@ -16274,6 +17766,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 "välj sport:" @@ -16665,30 +18157,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 "sport" @@ -16698,227 +18190,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 "flera" -#: 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 "bågskytte" -#: 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 "friidrott" -#: 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 "australisk fotboll" -#: 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 "baseball" -#: 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 "basket" -#: 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 "boule" -#: 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 "kanot" -#: 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 "klättring" -#: 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 "cricket" -#: 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 "kricket_nät" -#: 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 "krocket" -#: 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 "cykling" -#: 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 "hundracing" -#: 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 "ridsport" -#: 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 "amerikansk fotboll" -#: 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 "golf" -#: 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 "gymnastik" -#: 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 "ishockey" -#: 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 "hästkapplöpning" -#: 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 "motorsport" -#: 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 "pelota" -#: 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 "rackets" -#: 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 "rugby" -#: 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 "skytte" -#: 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 "skateboard" -#: 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 "skridskoåkning" -#: 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 "skidåkning" -#: 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 "fotboll" -#: 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 "simning" -#: 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 "bordtennis" -#: 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 "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sporthall" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Redigera sporthall" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Plan" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Redigera plan" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Bana" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Redigera bana" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfbana" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Redigera golfbana" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Redigera minigolfbana" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Flera" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Redigera flersportsfacilitet" @@ -16957,248 +18447,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 "plan" -#: 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 "sporthall" -#: 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 "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Friidrott" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Redigera friidrott" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Bågskytte" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Redigera bågskytte" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klättring" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Redigera klättring" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kanotpaddling" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Redigera kanotpaddling" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Cykling" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Redigera cykling" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Hundkapplöpning" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Redigera hundkapplöpning" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Ridsport" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Redigera ridsport" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Hästkapplöpning" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Redigera hästkapplöpning" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastik" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Redigera gymnastik" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorsport" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Redigera motorsport" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skridskoåkning" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Redigera skridskoåkning" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Redigera skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Simning" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Redigera simning" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Skidåkning" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Redigera skidåkning" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Skidspårstyp" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "utförsåkning" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "längdskidåkning" -#: 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 "Svårighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "nybörjare" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "lätt" -#: 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 "expert" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "ospårat" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Skytte" @@ -17206,178 +18688,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Redigera skytte" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Bollsport" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fotboll" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Redigera fotboll" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Amerikansk fotboll" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Redigera amerikansk fotboll" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australisk fotboll" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Redigera australisk fotboll" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Redigera baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basket" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Redigera basket" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Redigera golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golf_bana" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Redigera boule" -#: 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 "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Redigera cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricketnät" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Redigera cricketnät" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Krocket" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Redigera krocket" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Ishockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Redigera ishockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Redigera pelota" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Rackets" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Redigera rackets" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Redigera rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Bordtennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Redigera bordtennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Redigera tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Byggnader" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Byggnad" @@ -17385,5 +18867,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Offentlig byggnad" @@ -17391,10 +18873,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Redigera offentlig byggnad" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Stadshus" @@ -17402,10 +18884,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Redigera stadshus" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassad" @@ -17413,10 +18895,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Redigera ambassad" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Domstol" @@ -17425,10 +18907,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Redigera domstol" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Fängelse" @@ -17437,10 +18919,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Redigera fängelse" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Polisstation" @@ -17450,10 +18932,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 "Redigera polisstation" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Brandstation" @@ -17462,10 +18944,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Redigera brandstation" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postkontor" @@ -17473,5 +18955,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Redigera postkontor" @@ -17479,15 +18961,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Barndaghem" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Redigera barndaghem" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Skola" @@ -17495,10 +18977,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Redigera skola" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Högskola/universitet" @@ -17506,10 +18988,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Redigera högskola/universitet" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Högskola" @@ -17517,5 +18999,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Redigera högskola" @@ -17523,5 +19005,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Biograf" @@ -17530,10 +19012,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Redigera biograf" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliotek" @@ -17542,10 +19024,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Redigera bibliotek" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Konstcenter" @@ -17553,10 +19034,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Redigera konstcenter" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teater" @@ -17565,10 +19046,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Redigera teater" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Religiös helgedom" @@ -17578,5 +19059,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 "Redigera religiös helgedom" @@ -17585,6 +19066,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 "Religion" @@ -17593,66 +19074,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 "bahai" -#: 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 "buddism" -#: 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 "kristendom" -#: 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 "hinduism" -#: 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 "jain" -#: 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 "judendom" -#: 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 "islam" -#: 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 "sikh" -#: 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 "daoism" -#: 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 "zoroastrianism" -#: 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 "Samfund" @@ -17661,81 +19142,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 "anglikaner" -#: 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 "baptister" -#: 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 "katoliker" -#: 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 "evangelister" -#: 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 "jehovas_vittnen" -#: 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 "luteraner (inkl. Svenska kyrkan)" -#: 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 "metodister" -#: 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 "mormoner" -#: 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 "ortodoxa" -#: 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 "pinstvänner" -#: 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 "presbytarianer" -#: 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 "protestanter" -#: 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 "kväkare" -#: 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 "shiamuslimer" -#: 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 "sunnimuslimer" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresser" @@ -17744,5 +19225,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Redigera adressinformation" @@ -17750,5 +19231,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Husnummer" @@ -17756,20 +19237,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Husnamn" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Stadsnamn" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postnummer" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Landskod" @@ -17777,5 +19258,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -17784,5 +19265,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Redigera adressinterpolation" @@ -17790,71 +19271,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Numreringsschema" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "udda" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "jämn" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "alla" - -#: 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 "Byggnadsverk" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabrik" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Redigera fabriksbyggnad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Torn" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Redigera torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vattentorn" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Redigera vattentorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gasklocka" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Redigera gasklocka" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Fyrtorn" @@ -17862,10 +19339,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Fyrtorn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Väderkvarn" @@ -17873,10 +19350,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Redigera väderkvarn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Rörledning" @@ -17884,10 +19361,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Redigera rörledning" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Reningsverk" @@ -17897,10 +19374,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 "Redigera reningsverk" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Kran" @@ -17908,10 +19385,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Redigera kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Fyrbåk" @@ -17919,10 +19396,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Redigera fyrbåk" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Mätpunkt" @@ -17930,10 +19407,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Redigera mätpunkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Övervakning" @@ -17941,5 +19418,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Redigera övervakningskamera" @@ -17947,5 +19424,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Kraftverk" @@ -17955,39 +19432,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 "Redigera ett kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "vindkraft" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vattenkraft" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossila bränslen" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "kärnkraft" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kolkraft" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "solkraft" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "naturgas" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Kraftstation" @@ -17996,10 +19473,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Redigera en kraftstation" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -18008,5 +19485,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Redigera en transformatorstation" @@ -18014,10 +19491,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 "Kraftledningsmast" @@ -18028,5 +19505,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 "Redigera en kraftledningsmast" @@ -18034,5 +19511,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Kraftledning" @@ -18041,46 +19518,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Redigera en kraftledning" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Spänning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Antal kablar" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Inrättningar" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toaletter" -#. 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 "Referensnummer" - #. 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 "Anteckning" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Brevlåda" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -18089,5 +19560,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Redigera en telefon" @@ -18095,5 +19566,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 "Mynt" @@ -18101,5 +19572,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 "Anteckningar" @@ -18107,5 +19578,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 "Betalkort" @@ -18113,5 +19584,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 "Kontokort" @@ -18119,15 +19590,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 "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Återvinning" @@ -18136,5 +19607,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Redigera en återvinningsstation" @@ -18142,80 +19613,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Burkar" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Kläder" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Metallskrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Bänk" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Jakttorn" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Redigera ett jakttorn" -#. 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 "Höjd" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "låg" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "halv" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "full" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Dölj" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Lås" -#. 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 "Höjd" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "låg" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "halv" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "full" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontän" @@ -18224,10 +19691,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Redigera en fontän" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Dricksvatten" @@ -18236,10 +19703,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Redigera dricksvattensfacilitet" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "" @@ -18247,25 +19714,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 "Affärer" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Stormarknad" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Redigera stormarknad" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Fäbod" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Redigera fäbod" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Närköp" @@ -18273,10 +19750,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Redigera närköp" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18284,10 +19760,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Redigera kiosk" -#. 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 "Redigera en busshållplats" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Redigera ett träd" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Automat" @@ -18295,5 +19790,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Redigera en automat" @@ -18301,88 +19796,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Varor till försäljning" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "biljetter för allmänna transportmedel" -#: 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 "parkeringsbiljetter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "mat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "dryck" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "godis" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "foton" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "djurmat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "tidningar" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "leksaker" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "frimärken" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telefonkort" -#: 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 "kondomer" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "hundpåsar" #. 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 "Slakteri" @@ -18390,10 +19885,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Redigera slakteri" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Bageri" @@ -18401,10 +19895,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Redigera bageri" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Florist" @@ -18412,20 +19905,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Redigera florist" -#. 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 "" @@ -18433,60 +19924,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 "Drycker" #. 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 "Dator" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Redigera datoraffär" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Electronik" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Redigera elektronikaffär" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Redigera hifi-affär" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Möbler" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Redigera möbelaffär" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Trädgårdscenter" @@ -18494,10 +19979,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Redigera trädgårdscenter" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Järnvaror" @@ -18505,10 +19989,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Redigera järnaffär" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Gör-det-själv-affär" @@ -18516,60 +19999,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Redigera gör-det-själv-affär" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Kontorsmaterial" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Redigera pappershandel" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Hårfrisör" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Redigera hårfrisör" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Skor" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Redigera skoaffär" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Leksaker" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Redigera leksaksaffär" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Videobutik" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Redigera videobutik" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Kemtvätt" @@ -18577,10 +20054,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Redigera kemtvätt" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Tvätteri" @@ -18588,10 +20064,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Redigera tvätteri" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Friluftsliv" @@ -18599,35 +20074,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Redigera affär för friluftsliv" -#. 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 "Redigera sportaffär" -#. 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 "Redigera optiker" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Pengar" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -18635,16 +20107,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Redigera bank" -#. 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 "Uttagsautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Växlingskontor" @@ -18652,5 +20122,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Redigera växlingskontor" @@ -18658,15 +20128,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Redigera uttagsautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Hälsovård" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Läkare" @@ -18674,20 +20144,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Redigera läkare" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Tandläkare" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Redigera tandläkare" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apotek" @@ -18695,5 +20163,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Redigera apotek" @@ -18701,10 +20169,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Receptutlämnande" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Sjukhus" @@ -18712,10 +20179,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Redigera sjukhus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "" @@ -18724,5 +20191,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18731,20 +20198,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 "Telefonnummer" #. 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 "Använd internationellt format, ex +12-345-67890" @@ -18752,5 +20219,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 "Veterinär" @@ -18759,55 +20226,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Redigera veterinär" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Redigera en kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Redigera land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Delstat" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Redigera delstat" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Redigera region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Län" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Redigera län" @@ -18815,15 +20282,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Stad" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Redigera stad" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Småstad" @@ -18831,10 +20298,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Redigera småstad" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Förort" @@ -18842,25 +20309,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Redigera förort" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Mindre tätort" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Redigera mindre tätort" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Småort" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Redigera småort" @@ -18868,5 +20335,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Plats" @@ -18874,10 +20341,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Redigera plats" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Ö" @@ -18885,11 +20352,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Redigera ö" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "vänster" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Redigera fäbod" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Grottöppning" @@ -18897,10 +20377,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Redigera en grottöppning" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Topp" @@ -18908,10 +20388,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Redigera topp" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Glaciär" @@ -18919,10 +20399,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Redigera en glaciär" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkan" @@ -18930,70 +20410,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Redigera en vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Gränser" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nationella" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Redigera nationsgränser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrativ" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Redigera administrativa gränser" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civilrättslig" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Redigera en civilrättslig gräns" #. 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 "Redigera politiska gränser" #. 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 "Redigera gräns för nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Markanvändning" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Träd" @@ -19002,15 +20482,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Redigera ett träd" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botaniskt namn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Naturskog" @@ -19019,5 +20499,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Redigera naturskog" @@ -19025,17 +20505,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 "barrskog" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "lövskog" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "blandskog" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Kulturskog" @@ -19044,14 +20524,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Redigera användning av mark för skogsbruk" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Redigera naturreservat" @@ -19059,25 +20539,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Bergsluttning (med lösa stenar)" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Redigera bergssluttning (med lösa stenar)" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Buskage" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Redigera buskage" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Höglandshed" @@ -19085,10 +20565,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Redigera en höglandshed" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Hed" @@ -19096,5 +20576,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Redigera hed" @@ -19102,5 +20582,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Gårdsplan" @@ -19109,45 +20589,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Redigera markanvändning som gårdsplan" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Jordbruksmark" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Redigera användning av mark för jordbruk" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Äng" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Redigera markanvändning som äng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Redigera användning av mark för vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Kolonilotter" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Redigera användning av mark för koloniområden" @@ -19155,25 +20635,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Trädgård" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Redigera trädgård" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Gräs" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Redigera markanvändning som gräsyta" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Allmänning" @@ -19181,10 +20661,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Redigera användning av mark för allmänning" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Allmänning" @@ -19192,20 +20672,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Redigera allmänning" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Redigera park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Fritidsområde" @@ -19213,5 +20693,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Redigera användning av mark för fritidsområde" @@ -19219,15 +20699,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Bostadsområde" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Redigera användning av mark för bostadsområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Kyrkogård" @@ -19235,9 +20715,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Redigera kyrkogård" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Begravningsplats" @@ -19245,39 +20725,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Redigera användning av mark för begravningsplats" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Detaljhandel" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Redigera användning av mark för detaljhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Affärsområde" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Redigera användning av mark för affärsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industriområde" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Redigera användning av mark för industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Järnvägsmark" @@ -19285,15 +20765,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Redigera användning av mark för järnvägsmark" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militärt område" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Redigera användning av mark för militärt område" @@ -19301,55 +20781,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Byggnadsplats" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Redigera markanvändning som byggnadsplats" #. 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 "Deponi" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Redigera användning av mark för deponi av avfall" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Stenbrott" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Redigera användning av mark för stenbrott" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19359,5 +20839,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 "Redigera en multipolygon" @@ -19366,10 +20846,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "yttre segement" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "inre segment" @@ -19377,5 +20857,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19384,5 +20864,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19390,34 +20870,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Begränsning" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "ingen_vänstersväng" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "ingen_högersväng" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "inte_rakt_fram" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "ingen_u_sväng" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "enbart_högersväng" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "enbart_vänstersväng" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "enbart_rakt_fram" @@ -19426,15 +20906,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "från sträcka" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "via nod eller sträcka" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "till sträcka" @@ -19442,5 +20922,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19449,5 +20929,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19455,5 +20935,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19525,5 +21005,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 @@ -19532,17 +21012,17 @@ msgstr "cykel" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "buss" -#: 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 "" @@ -19595,5 +21075,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 @@ -19602,13 +21082,13 @@ msgstr "fot" -#: 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 "" @@ -19622,10 +21102,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "tunnelbana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "" @@ -19633,31 +21113,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 "" @@ -19666,30 +21146,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 "" @@ -20127,11 +21607,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 "förlegad" @@ -20457,41 +21937,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 "gata" #. color street @@ -22192,5 +23635,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 "" @@ -22789,55 +24232,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22851,5 +24245,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 "turism" @@ -22921,8 +24315,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 "historisk" @@ -22993,8 +24387,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 "" @@ -23008,5 +24402,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "stenbrott" @@ -23020,5 +24414,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -23040,5 +24434,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "hamnbassäng" @@ -23052,5 +24446,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "skog" @@ -23064,5 +24458,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "gårdsplan" @@ -23085,5 +24479,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "detaljhandel" @@ -23097,5 +24491,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industri" @@ -23109,5 +24503,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -23121,5 +24515,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -23133,5 +24527,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -23188,7 +24582,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 "militär" @@ -23202,5 +24596,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "begravningsplats" @@ -23213,5 +24607,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "topp" @@ -23226,5 +24620,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "glaciär" @@ -23238,5 +24632,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulkan" @@ -23291,8 +24685,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 "naturfenomen" @@ -23306,5 +24700,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "buskage" @@ -23318,20 +24712,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "hed" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "skog" - #. color water #. 1 @@ -23342,5 +24724,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "lera" @@ -23354,5 +24736,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "strand" @@ -23430,8 +24812,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 "rutt" @@ -23479,7 +24861,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 "gräns" @@ -23621,10 +25003,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 "plats" @@ -23672,6 +25063,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 "adress" @@ -23968,4 +25359,73 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Tips: Några av ändringarna härrör från inskickning av nya data till " +#~ "servern." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. " +#~ "Rapportera in detta som ett fel." + +#~ msgid "No document open so nothing to save." +#~ msgstr "" +#~ "Det finns inte något öppet dokument, så det finns inte något att spara." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Ta bort {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Radera relationsmedlem {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan inte öppna inställningsmappen: {0}" + +#~ msgid "nodes" +#~ msgstr "noder" + +#~ msgid "ways" +#~ msgstr "vägar" + +#~ msgid "relations" +#~ msgstr "relationer" + +#~ msgid "Delete Layer" +#~ msgstr "Ta bort lager" + +#~ msgid "Authors: {0}" +#~ msgstr "Upphovsmän: {0}" + +#~ msgid "Public" +#~ msgstr "Publik" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du " +#~ "skickar in det." + +#~ msgid "Continue anyway" +#~ msgstr "Fortsätt ändå" + +#~ msgid "map" +#~ msgstr "karta" + +#~ msgid "citymap" +#~ msgstr "stadskarta" + +#~ msgid "hikingmap" +#~ msgstr "vandringskarta" + +#~ msgid "bicyclemap" +#~ msgstr "cykelkarta" + #~ msgid "Move" #~ msgstr "Flytta" @@ -23985,7 +25445,4 @@ #~ msgid "Aborting..." #~ msgstr "Avbryter..." - -#~ msgid "Not implemented yet." -#~ msgstr "Inte implementerat ännu." #~ msgid "Unknown file extension." @@ -24029,7 +25486,4 @@ #~ msgid "Date" #~ msgstr "Datum" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Jämka konflikter" #~ msgid "Data Layer" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 17484) +++ /applications/editors/josm/i18n/po/tr.po (revision 17485) @@ -10,7 +10,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-15 13:39+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-24 13:27+0000\n" +"Last-Translator: katpatuka \n" "Language-Team: Türkçe\n" "MIME-Version: 1.0\n" @@ -18,77 +18,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\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" -#: ../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 "Arayüz Oluşturuluyor." #. 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 "Yardım" -#: ../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 "" -#: ../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 @@ -98,154 +101,160 @@ #: ../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 "Hata" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi." - -#: ../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] "" +"Değişikleri henüz kaydedilmemiş. Boş verip devam etmek istiyor musun?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" -msgstr "Saklanılmayan Çalışmalar" - -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Bazı çalışmalar saklanılmadı. Değişikliklerden vazgeç ve Devam Et?" - -#: ../core/src/org/openstreetmap/josm/Main.java:402 +msgstr "Kaydedilmemiş Değişiklikler" + +#: ../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 +msgstr "Kaydet ve Çık" + +#: ../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 +msgstr "Vazgeç ve Çık" + +#: ../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 "İptal" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{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 "Uyarı" -#: ../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 "Yanlış dosyalr atlanıldı URL: \"{0}\"" +msgstr "hatalı dosya atlandı URL: \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -270,10 +279,11 @@ #: ../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" -msgstr "Java OpenStreetMap Editor" +msgstr "Java OpenStreetMap Editörü" #. Add the version number @@ -283,19 +293,19 @@ #, java-format msgid "Version {0}" -msgstr "Versiyon {0}" +msgstr "Sürüm {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" -msgstr "En son değişiklik {0}" +msgstr "Son değişiklik: {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" -msgstr "Java Version {0}" +msgstr "Java Sürümü {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" -msgstr "Başlangıç Sayfası" +msgstr "Anasayfa" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 @@ -308,5 +318,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" @@ -315,5 +325,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" -msgstr "Okubeni" +msgstr "Beni oku" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 @@ -327,9 +337,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 msgid "License" -msgstr "" +msgstr "Lisans" #: ../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 "Eklentiler" @@ -346,13 +356,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -361,5 +378,5 @@ msgstr "" -#: ../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 "" @@ -369,11 +386,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 +msgstr "Birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -382,5 +399,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 "" @@ -390,18 +407,18 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." -msgstr "Kavşak Ekle..." +msgstr "Nokta Ekle..." #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." -msgstr "Enlem ve Boylam girerek kavşak ekle." +msgstr "Enlem ve Boylam girerek nokta ekle." #: ../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 @@ -413,9 +430,9 @@ #, java-format msgid "Edit: {0}" -msgstr "Düznele: {0}" +msgstr "Düzenle: {0}" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." -msgstr "Yeni kavşak için koordinat giriniz." +msgstr "Yeni nokta için koordinat giriniz." #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 @@ -430,5 +447,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 "Enlem" @@ -437,30 +454,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 "Boylam" +#: ../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 "Daire içindeki kavşakları hizala" +msgstr "Noktalar daire olarak hızala" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +msgid "Move the selected nodes into a circle." +msgstr "Seçili noktaları daire olarak yerleştir" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 -msgid "Move the selected nodes into a circle." -msgstr "Seçili kavşakları daire içine taşı." - -#: ../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/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 @@ -474,6 +491,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 @@ -481,58 +498,57 @@ msgstr "Araç: {0}" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 +msgid "Please select at least four nodes." +msgstr "En azından dört nokta seç." + +#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 -msgid "Please select at least four nodes." -msgstr "Lütfen en az dört kavşak seçiniz." - -#. 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/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 "Bilgi" #. 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 "Kavşakları bir çizgiye hizala" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +msgstr "Noktalar düz çizgi olarak hızala" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 msgid "Move the selected nodes in to a line." -msgstr "Seçili kavşakları bir çizgiye taşı." - -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +msgstr "Seçili noktalar düz çizgi olarak yerleştir" + +#: ../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 "lütfen en az üç kavşak seçiniz." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +msgstr "En azından üç nokta seçmen lazım" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -541,10 +557,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -553,5 +569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -560,46 +576,46 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" -msgstr "bilgi" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +msgstr "veri" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "tabaka" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" -msgstr "selection" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +msgstr "seleksiyon" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" -msgstr "Çelişki" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +msgstr "çakışma" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" -msgstr "" - +msgstr "indir" + +#: ../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} a Yaklaş" +msgstr "{0} kadar yakınlaştır" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#, java-format +msgid "Zoom the view to {0}." +msgstr "Görünüm {0} kadar yakınlaştır {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 -#, java-format -msgid "Zoom the view to {0}." -msgstr "Görünümü {0} a yaklaştır." - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -609,22 +625,22 @@ msgstr "Görüntü: {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 "Yaklaşılacak bir şey yok." - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +msgstr "Yakınlaştıracak bir şey yok." + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "No conflicts to zoom to" -msgstr "Yaklaşılacak çelişki yok" - +msgstr "Yakınlaştıracak bir çakışma yok." + +#: ../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 "Yolları Birleştir" -#: ../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 "Çeşitli yolları birine birleştir." -#: ../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 "Lütfen birleştirmek için en az iki yol seçiniz." @@ -635,4 +651,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Ne olursa olsun: Birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -642,103 +662,100 @@ "istiyormusunuz?" -#: ../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 "Yöneleri değiştir?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +msgstr "Yönü değiştirilsin mi?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +msgid "Reverse and Combine" +msgstr "Yönü değiştirip birleştir" + +#: ../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 "" -"Yollar şu anki pozisyonlarında birleştirilemiyorlar. Bazılarını değiştirmek " -"istermisiniz?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -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 +"Yollar değişik yön kullanıldığı için birleştirilemez. Bazılarının yönü " +"değiştirmek istermisiniz?" + +#: ../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 "Bütün çelişkilere değer ver." - -#: ../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 +msgstr "Bütün çakışmaları için yeni değerler gir." + +#: ../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 +msgstr "Çakışmaları Çöz" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #, java-format msgid "Combine {0} ways" -msgstr "{0} yolu birleştir" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272 +msgstr "{0} yol birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 msgid "All the ways were empty" msgstr "Bütün yollar boştu" -#: ../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 " "nodes)" -msgstr "Yollar birleştirilemez (Tek bir kavşak metni içine konulamaz)" - +msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)" + +#: ../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 "Kopyala" -#: ../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 "Seçili objeleri yapıştır alanına (buffer) kopyala." -#: ../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 "Lütfen kopyalama için seçim yapınız" +#: ../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 "Daire Oluştur" -#: ../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 "Seçili üç noktadan daire oluştur." -#: ../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 "Bu noktalar daire şeklinde değiller. Vazgeçtik." + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" +"Ya tam iki veya üç ayrı nokta seç ya da tam iki veya üç nokta içeren tek bir " +"yol seç" #: ../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 "Sil" @@ -748,85 +765,86 @@ msgstr "Seçili Objeleri Sil." -#: ../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 "Üzerine Yaz" -#: ../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 "Dosya mevcut. Üzerine Yaz?" #. 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 +msgstr "Noktaları Dağıt" + +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "" - +msgstr "Noktaları düz bir çüzgi olarak dağıt" + +#: ../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 sitesinden indiriliyor..." +msgstr "OSM sitesinden indir..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +msgid "Download map data from the OSM server." +msgstr "Harita verisi OSM sunucusundan indir." #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 -msgid "Download map data from the OSM server." -msgstr "Harita verisi OSM serverından indiriliyor." - -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../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 "Dosya: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "İndir" -#: ../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 "Lütfen en az bir indirme görevi seçiniz" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +msgstr "Dışalım işlemi esnasında {0} çakışma oldu." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +msgstr "İndirirken çakışmalar oldu" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -835,6 +853,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 "Çift" @@ -858,85 +876,91 @@ msgstr "Programı Kapat." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Bütün imajlar" + +#: ../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 Yap..." - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 +msgstr "GPX olarak kaydet..." + +#: ../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 dosyasına çevir." - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +msgstr "Veri GPX dosyası olarak kaydet." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." -msgstr "Çevirecek bişey yok. Biraz bilgi edinin." - -#: ../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 +msgstr "Dışa vermek için bir şey yok. Önce veri al, salak!" + +#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58 +msgstr "parametre ''{0}'' zero (null) olamaz" + +#: ../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 "" -#: ../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 dosyası olarak kaydet..." + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM Online Yardım Dosyası" +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +msgid "Open in Browser" +msgstr "Tarayıcında Aç" + #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -msgid "Open in Browser" -msgstr "Tarayıcıda Açınız" - -#: ../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: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 "Düzenle" -#: ../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 "Yenile" -#: ../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 "Yardım dosyalaları sadece online oalrak düzenlebilir" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 +msgstr "Sadece JOSM Online Yardım dosyalaları düzenlenebilir" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199 #, java-format msgid "Error while loading page {0}" -msgstr "Sayfanın yüklenmesinde hata {0}" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 +msgstr "Sayfa {0} yüklerken hata oluştu" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format msgid "Help page missing. Create it in english." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +msgstr "Yardım sayfası yok. english olarak oluştur." + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -944,4 +968,6 @@ "\">your language." msgstr "" +"Yardım sayfası yok. english ya da türkçe olarak oluştur." #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15 @@ -957,5 +983,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Eleman Bilgisi" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -966,13 +992,13 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 msgid "Join Node to Way" -msgstr "Kavşağı yola birleştir" +msgstr "Nokta ile yol birleştir" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 msgid "Join a node into the nearest way segments" -msgstr "Kavaşağı en yakın yol segmentine birleştir" +msgstr "Noktayı en yakın yol bölümüne birleştir" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72 msgid "Join Node and Line" -msgstr "Yol ve Kavşağı birleştir" +msgstr "Nokta ile çizgi birleştir" #: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 @@ -982,106 +1008,109 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "Tabakalar birleştir" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - +msgstr "Varsayılan tabaka başka bir tabaka ile birleştir" + +#: ../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 "Kavşakları Birleştir" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +msgstr "Noktaları birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." -msgstr "Kavşakları en yaşlı olana birleştir." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +msgstr "Noktaları en eskisiyle birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." -msgstr "Lütfen birleşim için en az iki kavşak seçiniz." +msgstr "Birleştirmek için en azından iki nokta seçmen lazım." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 +msgid "Merge nodes with different memberships?" +msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge nodes with different memberships?" -msgstr "Farklı özellikli kavşakları birleştir?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +msgid "Merge Anyway" +msgstr "Neyse Birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " "to merge them?" -msgstr "Seçili kavşaklar, farklı ilişkileri var. Birleştirmek istiyormusun?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254 +msgstr "" +"Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor " +"musun?" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Kavşaklar birleştirlemiyor: Kullanılan bir yolun silinmesi gerekiyor." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297 +msgstr "" +"Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 #, java-format msgid "Merge {0} nodes" -msgstr "{0} Kavşak birleştirildi" - +msgstr "{0} nokta birleştiriliyor" + +#: ../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 "Seleksiyonu birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "" +msgstr "En azından bir nokta veya bir yol seç" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "yukarı" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -msgid "up" -msgstr "Yukarı" - -#: ../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: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 "Objeleri taşı {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "aşağı" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "sol" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "sağ" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Taşı {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 "Objeleri taşı {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 "Objeleri dünya dışına taşıyamazsın." @@ -1089,5 +1118,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 "Yeni" @@ -1097,16 +1126,21 @@ msgstr "Yeni harita oluştur." -#: ../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 "Aç..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Dosya aç." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Dosya aç." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, java-format +msgid "Opening file ''{0}'' ..." msgstr "" @@ -1114,9 +1148,9 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." -msgstr "Lokasyon Aç" +msgstr "Konum Aç..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." -msgstr "Link Aç." +msgstr "Bağlantı aç..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 @@ -1139,27 +1173,23 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" -msgstr "Orthogonalize Shape" +msgstr "Dikdörtgen olarak şekilendir" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Kavşakları taşı, açılar 90 veya 270 derece olsun" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" -msgstr "Sadece iki kavşak olabilir" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +msgstr "Sadece iki nokta olabilir" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 msgid "Selection must consist only of ways." msgstr "Seçimde sadece yollar olmalı." -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz." - -#: ../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 " @@ -1168,11 +1198,11 @@ 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 "Sadece bir kavşak seçili" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +msgstr "Sadece bir nokta seçili" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" -msgstr "Orthogonalise" +msgstr "Dikdörtgenleştir" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -1186,14 +1216,25 @@ msgstr "Yapıştır hafızasındaki bilgileri yapıştır." -#: ../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 "Etiketleri Yapıştır" -#: ../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 "" "Yapıştırma hafızsında bulunan etiket içeriklerini seçili elemanlara ekle." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Yükleniyor {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1219,37 +1260,32 @@ msgstr "Son bitmemiş komutu tekrar yap." -#: ../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 "Takayı yeniden isimlerdir" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Dosyayıda yeniden isimlendir" -#: ../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 "" +#: ../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 "Yolları ters çevir" -#: ../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 "Seçili yollar için yönü ters çevir." -#: ../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 "Lütfen en az bir yol seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Yolları ters çevir" @@ -1257,10 +1293,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 "Kaydet" #: ../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 "Şimdiki bilgiyi kaydet." @@ -1271,37 +1308,25 @@ msgstr "" -#: ../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 "" -"Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata olarak " -"bildiriniz" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Döküman açık değil Kayıt yapılamaz." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Boş döküman" -#: ../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 "Çelişkiler" -#: ../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 " @@ -1309,28 +1334,28 @@ msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?" -#: ../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 dosyası olarak sakla" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "GPX olarak sakla" -#: ../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 "Farklı Kaydet..." -#: ../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 "Varolan bilgileri yeni bir dosyaya kaydet." @@ -1363,38 +1388,38 @@ msgstr "" -#: ../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 "Yolları Böl" -#: ../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 "Seçili kavşakta yolu böl." -#: ../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 "Yapılan seçim bölme için kullanılamaz." -#: ../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." msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil." -#: ../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 " @@ -1406,19 +1431,19 @@ msgstr[1] "" -#: ../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 "seçili kavşaklar aynı yolu paylaşmıyorlar." -#: ../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." msgstr[0] "Seçili yol seçili kavşakları içermiyor." -#: ../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 "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz." -#: ../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 " @@ -1427,5 +1452,5 @@ "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)" -#: ../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 " @@ -1433,5 +1458,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 " @@ -1439,8 +1464,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} Yolu {1} parçaya bölünecek" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Kapanıyor..." + +#: ../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 "Kapanıyor..." + +#: ../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 "Açılıyor..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Kapanıyor..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1458,46 +1508,46 @@ msgstr "Genel ayarları sabitle ''{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 "Yolları Çıkar" -#: ../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 "Birçok yol tarafında kullanılan kavşakları çift yap." -#: ../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 "Bu kavşak başka bir nesneye yapışık değil." -#: ../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 "Kavşakların hiçbiri herhangi bir nesneye yapışık değil." -#: ../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 "Yolların kavşakları herhangi nesneye yapışık değil." -#: ../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 "Seçim çıkartmak için kullanılamaz." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Şunların Arasında Seçiniz:" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Birden fazla yol için kullanılan kavşak, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../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 "* Birden fazla yol için veya şu yollardan biri için, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1506,5 +1556,5 @@ "kullanılabilir, veya" -#: ../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." @@ -1512,5 +1562,5 @@ "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." -#: ../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" @@ -1523,9 +1573,9 @@ "kopyalarını oluşturur ve bütün kavşaklar seçilir" -#: ../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" @@ -1533,5 +1583,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" @@ -1575,61 +1625,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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 ye yükle..." -#: ../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 "Bütün değişiklikleri OSM server'ına yükle." -#: ../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 "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Yüklenilecek değişiklik yok." -#: ../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 "" -#: ../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 "" @@ -1643,17 +1703,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../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:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -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 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1664,32 +1724,70 @@ msgstr "" -#: ../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}\"" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Değişiklikleri yükle?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 "Varolan yola kavaşka ekle" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1697,31 +1795,76 @@ 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 "Yaptığınız yükleme için kısa bir bilgi yazınız:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Harita Ayarları" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Eklenilecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Düzenlenecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Silinecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Değişiklikleri yükle?" - -#: ../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] "Eklenilecek objeler:" + +#: ../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] "Düzenlenecek objeler:" + +#: ../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] "Silinecek objeler:" + +#: ../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 "Son değişiklik: {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1745,20 +1888,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 "Ses: {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 "Hızlı" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Hızlı İleri" @@ -1800,10 +1943,10 @@ msgstr "Önceki imleci oynat." -#: ../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 "Yavaş" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Yavaş İleri Götür" @@ -1831,31 +1974,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 "İçeri bilgi alınamadı." -#: ../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 verisi" -#: ../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 "" -#: ../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 "" @@ -1867,20 +2006,20 @@ msgstr "" -#: ../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 "Silme Modu" -#: ../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 "Kavşak veya yolları sil." -#: ../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 @@ -1889,5 +2028,5 @@ msgstr "Mode: {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 " @@ -1897,55 +2036,69 @@ "kavşakları silmebir yol silerken. Ctrl:referans objelerini sil" -#: ../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 "" +#: ../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 "Çiz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Kavşakları Çiz" -#: ../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 "Mode: Odağı Çiz" -#: ../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 @@ -1953,38 +2106,38 @@ msgstr "seçilmiş" -#: ../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 "Dünya dışına bir kavşak ekleyemezsiniz." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Kavşak Ekle" -#: ../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 "Yola kavşak ekle" -#: ../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 "Varolan yolu kavşağa ekle" -#: ../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 "Varolan yola kavaşka ekle" -#: ../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 "Yola kavşak ekle ve birleştir" -#: ../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." @@ -1993,14 +2146,14 @@ msgstr[1] "" -#: ../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 "" @@ -2020,5 +2173,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 "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız." @@ -2030,5 +2183,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 "Dönmeyi durdurmak için fare düğmesini bırakınız." @@ -2046,17 +2199,18 @@ "senkronize etmek için." +#: ../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 "Seçiniz" -#: ../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 "Objeyi seç,taşı ve dönder" -#: ../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" @@ -2065,25 +2219,29 @@ msgstr[1] "" -#: ../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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." @@ -2092,5 +2250,5 @@ "yapıştır." -#: ../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-" @@ -2115,60 +2273,60 @@ "sağzoom taşı ise sağ klik" +#: ../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 "Ara..." -#: ../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 "Objeleri ara." -#: ../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 "Lütfen bir aramametni giriniz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "seçimi değiştiriniz" -#: ../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 "seçime ekleyiniz" -#: ../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 "Seçimden çıkartınız" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "Harf hassas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "ifade anlatımı" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2176,109 +2334,109 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "nodes:... - object with given number of nodes" +msgid "modified - all changed objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Arama" -#: ../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}'' için herhangi karşılık bulunamadı" -#: ../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}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../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}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../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} Eşleşme bulundu" -#: ../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" @@ -2342,58 +2500,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Seçili alanı yükle" -#: ../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 "Kontak {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "İndiriliyor..." -#: ../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 "Link okunamadı: \"{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 "Link ayrıştırılamadı: \"{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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Kavşak Ekle" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "İlişkiler: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "{0} Objeyi Değiştir" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Son değişiklik: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "İlişkiyi değiştir" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Kaldır \"{0}\" için {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Kaldır \"{0}\" için {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 "Kaldır \"{0}\" için {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Ayarla {0}={1} için {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 "Ayarla {0}={1} için {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Ayarla {0}={1} için {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" @@ -2401,10 +2597,10 @@ msgstr[0] "obje" -#: ../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 "Kaldır \"{0}\" için {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}" @@ -2416,5 +2612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2423,10 +2619,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2435,5 +2631,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}''" @@ -2457,44 +2653,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Sil {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Sil {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] "Sil {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] "Silme Modu" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Sil {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] "{0} İlişki" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "İlişkilerde Karışıklık" -#: ../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 "" "Seçim \"{0}\" ,\"{1}\" ilişkisi tarafından {2} rölü için kullanılıyor.\n" "İlişkiden sil?" -#: ../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 "" "Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n" "İlişkiden Sil?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Yol segmentini ayrıştır" @@ -2502,6 +2710,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." @@ -2512,5 +2720,5 @@ "objeler onu kullanıyor olabilir.
Gerçekten silmek istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2521,5 +2729,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2554,10 +2762,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2570,18 +2788,38 @@ msgstr "Sıra" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" +msgstr "Çözümle {0} karşıklıkları {1} objelerinde" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Çözümle {0} karşıklıkları {1} objelerinde" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Çözümle {0} karşıklıkları {1} objelerinde" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Çözümle {0} karşıklıkları {1} objelerinde" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Çözümle {0} karşıklıkları {1} objelerinde" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" +msgstr "Çözümle {0} karşıklıkları {1} objelerinde" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2607,13 +2845,13 @@ "değişmesidata bütünlüğü için önerilir." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "İlişki" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Eski Rol" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Yeni Rol" @@ -2632,62 +2870,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 "Yeni Değer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Seçili değişiklikleri uygula" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Değişiklikleri Uygulama" -#: ../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 "lütfen hangi özelliğin değişimin uygulanacağını seçiniz." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Özellikleri " -#: ../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 "İlişkide rolü şunu gösteriyor" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Otomatic etiket düzetmesi" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Tercihler klasörü açılamıyor: {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 "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {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 "Tercihler {0} üzerinde saklanıldı" -#: ../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 "Could not upload preferences. Reason: {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 "Tercihler serverdan alınamadı." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2701,29 +2996,36 @@ msgstr "" -#: ../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 "Ondalık Derece" -#: ../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 "Derece Dakika Saniye" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "G" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "K" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "B" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "D" -#: ../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}" @@ -2735,15 +3037,229 @@ msgstr "" -#: ../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 "eksik" - -#: ../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 "Hata: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Uyarı: {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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Alan stili yol kapalı değil." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "multipoligon yolu ''{0}'' kapalı değil." + +#. 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 "İlişkide boş üye." + +#: ../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}'' üyesini ilişkiden sil." + +#: ../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 "Yol ''{0}'' iki noktadan az içeriyor." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Yol-Değil ''{0}'' multipolygon içinde." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Multipoligon için dış yol yok ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "iç yol ''{0}'' dışarıda." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "İç yol stili ''{0}'' multipolygon ." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Dış yol stili ''{0}'' bulunamadı." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "etiketsiz" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "metin" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "durgun" + #: ../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" @@ -2751,22 +3267,7 @@ msgstr[0] "kavşak" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Hata: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Uyarı: {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" @@ -2774,12 +3275,7 @@ msgstr[0] "yol" -#: ../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" @@ -2787,244 +3283,4 @@ msgstr[0] "ilişki" -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} üye" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "Karayolu" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "demiryolu" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "suyolu" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "arazi kullanımı" - -#: ../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} Kavşak" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Alan stili yol kapalı değil." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "multipoligon yolu ''{0}'' kapalı değil." - -#. 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 "İlişkide boş üye." - -#: ../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}'' üyesini ilişkiden sil." - -#: ../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 "Yol ''{0}'' iki noktadan az içeriyor." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Yol-Değil ''{0}'' multipolygon içinde." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Multipoligon için dış yol yok ''{0}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "iç yol ''{0}'' dışarıda." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "İç yol stili ''{0}'' multipolygon ." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Dış yol stili ''{0}'' bulunamadı." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "etiketsiz" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "metin" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "durgun" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3037,5 +3293,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "arkaplan" @@ -3045,5 +3301,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3053,5 +3309,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3062,21 +3318,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert Zone (Fransa)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert Zone (Estonia)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3097,8 +3353,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3106,15 +3362,99 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Tekrar Gösterme" -#: ../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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../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 "eksik" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "Karayolu" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "demiryolu" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "suyolu" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "arazi kullanımı" + +#: ../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} Kavşak" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} üye" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#. 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 "bilinmeyen" + +#: ../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 "" @@ -3124,36 +3464,9 @@ msgstr "" -#: ../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 "bilinmeyen" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3163,9 +3476,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 "" @@ -3174,9 +3487,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3185,9 +3498,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 "" @@ -3197,9 +3521,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Tanımsız host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3209,11 +3533,6 @@ msgstr "" -#: ../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 "" @@ -3231,28 +3550,28 @@ 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 "Tercihleri yükleyiniz" -#: ../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 "Tercihleri server'a yükleyiniz" -#: ../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 "metin" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Kullanıcının Adı." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "OSM Şifresi." -#: ../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 "" @@ -3260,11 +3579,11 @@ "GENIŞLIKxYUKSEKLIK)" -#: ../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 "metin;metin;..." -#: ../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 " @@ -3273,5 +3592,5 @@ "Hepsini indir x1,y1,x2,y2 içeren linkler lat=y&lon=x&zoom=z veya dosyaadı" -#: ../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 " @@ -3281,5 +3600,5 @@ "veya dosyaadı" -#: ../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 " @@ -3289,75 +3608,94 @@ "bir link olabilir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "herhangi" -#: ../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 "Belirlenmişse, konfigürsayonu sıfırla." -#: ../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 "KullanıcıAdı" -#: ../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 "şifre" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "kullanım" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "seçenekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Bu Yardımı Göster" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standart unix geometry argümanı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Kutu ile belirlenen sınırları indir" -#: ../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 "Linkteki bilgiyi indir (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 "Dosya Aç (ham gps, eğer .gpx ise)" -#: ../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 "Kutu ile belirlenen alanı ham gps olarak indir" -#: ../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 "Yapılan aramaya göre seçim yap" -#: ../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 "Tercihleri varsayılan değerlere getir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Dil seçimi." -#: ../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 "örnekler" -#: ../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" @@ -3367,47 +3705,47 @@ "bir harita yükleyiniz --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= indirmek yerine osm:// kullanabilirsin\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Güncellenen eklentiler aktif olacak" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Eski eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Varsayılan ayarlar alınıyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Eklentiler yükleniyor" -#: ../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." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Dosya" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Araçlar" -#: ../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 "Ayarlanmış" -#: ../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 @@ -3419,21 +3757,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 "Tel Görünümü" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Tel Göünümünü İşaretle" -#: ../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 "Ses" @@ -3473,58 +3811,44 @@ msgstr "Dışarı Zoom" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "ölçek" -#: ../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 "Fare imleci üzerindeki coğrafi boylam." -#: ../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 "Fare imleci üzerindeki objenin adı." -#: ../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 "Fare imleci üzerindeki coğrafi enlem." -#: ../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 "Önceki ve şimdiki yol kısımları arasındaki açı." -#: ../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 "Segment çizildi." -#: ../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 "Yeni yol segmentinin uzunluğu çizildi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(obje yok)" -#: ../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 "tabaka listede yok." -#: ../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 "" - -#: ../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 "" @@ -3536,10 +3860,4 @@ msgid "File not found" msgstr "Dosya bulunamadı" - -#: ../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 @@ -3598,7 +3916,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" @@ -3614,5 +3931,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" @@ -3715,5 +4032,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 "" @@ -3724,5 +4041,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" @@ -3736,5 +4053,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 "" @@ -3809,6 +4126,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" @@ -3918,10 +4235,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 "" @@ -3930,19 +4247,19 @@ msgstr "" -#: ../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 "" @@ -3951,5 +4268,5 @@ msgstr "" -#: ../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 "" @@ -3967,9 +4284,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 " @@ -3977,110 +4294,112 @@ 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 "silindi" -#: ../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 "" +#: ../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:583 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +msgid "Reset id to 0" +msgstr "" + +#: ../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:619 +msgid "Yes, purge it" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 -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?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 #, java-format msgid "" @@ -4089,21 +4408,21 @@ msgstr "" -#: ../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 "Rol" #: ../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 "" @@ -4142,10 +4461,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 @@ -4154,10 +4474,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 @@ -4171,5 +4492,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}" @@ -4210,4 +4531,137 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "" + +#: ../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 "boş" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "hepsi" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Renk seç" + +#: ../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 +#, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "" + +#: ../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 "parametre ''{0}'' zero (null) olamaz" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "" + +#: ../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 +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 "Henuz Yapılmadı." + +#: ../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 "Yolları şu şekilde etiketle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "İlişkiyi değiştir" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "İndirirken çakışmalar oldu" + +#: ../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} Yol" + +#: ../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} İlişki" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Çözünürlüğü değiştir" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Çakışmaları Çöz" + +#: ../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 "Yapıştır" + +#: ../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} Yol" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4223,10 +4677,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 @@ -4234,5 +4688,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}" @@ -4263,36 +4717,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 "Haritada seçili elemanları listedede seç." -#: ../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 "" @@ -4304,150 +4752,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 "Geçmiş" -#: ../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 "Seçili nesnelerin geçmişini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../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 "" -#: ../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 "" + +#: ../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 "Harita: {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 "İlişkiler: {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 "" - -#: ../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 "Reload all currently selected objects and refresh the list." #. 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 "Tabakalar" -#: ../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 "Yüklenilmiş olan tabakaların listesini göster." -#: ../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 "Seçili tabakayı sil." -#: ../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 "" - -#: ../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 "Göster/Sakla" -#: ../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 "Seçili tabakanın görünen kısmını sabitle." -#: ../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 "Seçili tabakayı bir satır yukarı taşı." -#: ../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 "Seçili tabakayı bir satır aşağı taşı." -#: ../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." @@ -4455,28 +4871,22 @@ msgstr[0] "İşlem {0} objeyi değiştirecek." -#: ../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 "Boş değer anahtarı sildi." -#: ../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 "Değerleri Değiştir?" -#: ../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" @@ -4484,89 +4894,84 @@ msgstr[0] "Değerleri {0} obje için değiştir" -#: ../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 "Lütfen bir anahtar seçiniz" -#: ../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 "Lütfen bir değer seçiniz" -#: ../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 "Özelliklerini değiştirmek istediğiniz objeleri seçiniz." -#: ../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 "Özellikler/Üyelikler" -#: ../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 "Seçili objenin özellikleri" #. 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 "Üyesi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Özellik Ekle" -#: ../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 "Ekle" -#: ../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 "Her obje için yeni bir anahtar/değer çifti ekleyiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Özellikleri Değiştir" -#: ../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 "Seçili anahtarın değerini her obje için düzenle" -#: ../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 "Özellik: {0} / Üyelik: {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 "Özellik / Üyelik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "İlişkiyi değiştir" -#: ../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 "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {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 "Seçili anahtarı her objeden sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Özelliği Sil" @@ -4575,34 +4980,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 "İlişkiler" -#: ../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 "İlişkilerin listesini göster." -#: ../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 "İlişkiler: {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 "Seçili ilişki için bir editör aç." -#: ../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 "Seçili ilişkiyi sil" -#: ../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 "Yeni ilişki oluştur" -#: ../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 "" @@ -4635,21 +5040,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 "Seçim" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} Yol" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} İlişki" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4657,78 +5050,103 @@ msgstr "Seçim: {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 "Panelin kilidini Kaldır" -#: ../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." msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." -#: ../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 "paneli büyütüp/küçültmek için tıklayınız" -#: ../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 "Yazarlar" -#: ../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 "Seçili obje üzerinde çalışna kişilerin listesini göster." -#: ../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] "yazar" + +#: ../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 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "yazar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objeler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Yazarlar: {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 "" @@ -4737,47 +5155,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 " @@ -4786,14 +5198,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 "" @@ -4803,9 +5215,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 "" @@ -4815,15 +5227,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4831,5 +5243,5 @@ msgstr "" -#: ../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 " @@ -4837,20 +5249,20 @@ msgstr "" -#: ../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 "" @@ -4859,57 +5271,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 "Seçili üyeyi yukarı taşı" #. 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 "Seçili üyeyi aşağı taşı" #. 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 " @@ -4918,9 +5330,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 "" @@ -4929,20 +5341,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 @@ -4952,37 +5360,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 "Bütün eksik yolları ve kavşakları ilişkili olarak indir" -#: ../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 "Üyeleri İndir" -#: ../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 "" @@ -4992,30 +5400,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 "" @@ -5029,22 +5437,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 "Eski eklentiler yükleniyor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5077,34 +5490,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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Sık Kullanılanlar" -#: ../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 "lütfen ilk olarak istenilen koordinatı giriniz." -#: ../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 "Lütfen bu yer için bir isim giriniz." -#: ../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 "İlk olarak sık kullanılanlardan bir yer seçiniz." @@ -5158,13 +5558,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 "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." -#: ../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 "Lütfen aranacak bir metin giriniz" -#: ../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 "Arama sonucu server dan alınamadı" @@ -5172,18 +5572,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 "Aranacak yerin adını giriniz:" -#. 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 "Yerler" #. 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 "sism" @@ -5222,37 +5621,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 "tip" -#: ../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 "yakın" -#: ../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 "yaklaş" -#: ../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: " @@ -5261,5 +5660,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 "Hareketli Harita" @@ -5286,46 +5685,74 @@ msgstr "Pafta Numarası" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" -msgstr "" - -#: ../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:44 +#, java-format +msgid "History for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, java-format +msgid "History for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, java-format +msgid "History for relation {0}" +msgstr "" + +#: ../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 "Tercihleri server'a yükleyiniz" + +#: ../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}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, java-format +msgid "id > 0 expected, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, java-format +msgid "Loading history for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, java-format +msgid "Loading history for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" msgstr "" @@ -5644,14 +6071,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5827,8 +6268,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" #. @@ -5925,4 +6372,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6036,6 +6486,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 @@ -6043,153 +6493,170 @@ #: 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 "İsim" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 #, java-format msgid "" "Version {0} created on {1} by " -"{2}" -msgstr "" +"{2} in changeset {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "İlişkiyi değiştir" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +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 "Son değişiklik: {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6198,32 +6665,282 @@ msgstr "" -#: ../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 "Sokak Adı" + +#: ../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 "Lütfen bir değer seçiniz" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parametre ''{0}'' zero (null) olamaz" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +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] "" + +#: ../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] "" + +#: ../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 "Vazgeç ve Çık" + +#: ../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 "Kaydet ve Çık" + +#: ../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 "Tabaka" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Yükleme" + +#: ../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 "Dosya" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Yenile" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "{0} için görüntüler" -#: ../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 Oku..." -#: ../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 "Noktalrı için {0} x {1} zaman yok" -#: ../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 "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" -#: ../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 "Zaman damgası okunabilen bir görüntü bulunamadı." -#: ../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 @@ -6231,29 +6948,29 @@ msgstr "{0} Okunuyor..." -#: ../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 "Geotagged Görüntüler" -#: ../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 başlangıç: {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 bitiş: {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 "şu anki delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "zaman dilimi farkı: " -#: ../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" @@ -6261,14 +6978,14 @@ msgstr[0] "görüntü" -#: ../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} izde var." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Saati eşle" -#: ../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 @@ -6276,82 +6993,82 @@ msgstr "JPEG görüntüsü (*.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}\" dosyasındaki zaman ayrıştırılamadı." -#: ../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 zamanı \"{0}\" dosyasında yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Görüntü" -#: ../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 "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" -#: ../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 ünitesi zamandilimi (resim farkı)" -#: ../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 "" -#: ../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 "Girilen zaman ayrıştırılamadı." -#: ../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 noktası" -#: ../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 "Çizimi özelleştir" +#: ../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 "Genel ayarları kullan." + #: ../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 "Genel ayarları kullan." +msgid "Draw lines between points for this layer." +msgstr "Bu tabaka için çizgiler arasını birleştir." #: ../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 "Bu tabaka için çizgiler arasını birleştir." - -#: ../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 "Bu tabaka için çizgileri birleştirme." -#: ../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 "Çizim seçeneklerini seçiniz" -#: ../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 "Renkleri Ayarla" -#: ../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 "Varsayılan" -#: ../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" @@ -6408,5 +7125,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}" @@ -6422,10 +7139,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 "Bilgi tabakasına çevir" #: ../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." @@ -6436,11 +7153,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 @@ -6482,4 +7199,9 @@ "istiyor musunuz?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Bilgi İndiriliyor" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6499,74 +7221,74 @@ "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı." -#: ../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 "" -#: ../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 "indirilen alanın dışında" -#: ../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 "" -#: ../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 "" -#: ../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} şunları içerir:" -#: ../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} silindi.)" -#: ../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 "" -#: ../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 tabakasına çevir" -#: ../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" msgstr[0] "iz" -#: ../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" msgstr[0] "nokta" -#: ../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" @@ -6574,5 +7296,5 @@ msgstr[0] "{0} noktalı iz" -#: ../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" @@ -6580,5 +7302,5 @@ msgstr[0] "{0} {1} izden oluşur" -#: ../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" @@ -6586,14 +7308,14 @@ msgstr[0] "{0} nokta" -#: ../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 imleçi" -#: ../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" msgstr[0] "imleç" -#: ../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" @@ -6611,5 +7333,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}." @@ -6617,5 +7339,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 "Çalan tabakada eşleme yapılamadı." @@ -6643,5 +7365,5 @@ msgstr "Görünen metin ve ikonları sabitle." -#: ../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 " @@ -6649,5 +7371,5 @@ msgstr "" -#: ../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 " @@ -6657,29 +7379,29 @@ "sürükleyiniz." -#: ../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 "Yeni ses imleci oluşturulamadı." -#: ../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 "Bu imleç için tanımlanan link gösterilemedi." -#: ../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 "(URL : " -#: ../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 "Linkin gösterilmesinde hata" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "İleri Tercihler" -#: ../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 "Tercihleri doğrudan ayarla. Dikkatli kullanılmalı!" -#: ../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 @@ -6687,26 +7409,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 "Seçim varsayılan değer." -#: ../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 "Varsayılan değer ''{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 "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)." -#: ../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 "Editlemek için bir satır seçiniz." -#: ../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 @@ -6714,14 +7436,14 @@ msgstr "{0} için yeni değer" -#: ../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 "Silmek için bir satır seçiniz." -#: ../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 "Yeni bir anahtar/değer çifti gir" @@ -6849,40 +7571,40 @@ msgstr "Ses kayıt cihazı kalibrasyonu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Renk" -#: ../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 "Boya Stili {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 "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Seç" -#: ../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} için bir renk seçiniz" -#: ../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 da farklı objlerin kullandığı renkler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Renkler" @@ -6926,5 +7648,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Araba" @@ -6946,16 +7668,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 "Bisiklet" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -6985,12 +7708,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 "Ayak" @@ -7163,5 +7886,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 "Show splash screen at startup" @@ -7169,23 +7892,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 "Seçim listesindeki objenin ID sini göster" #: ../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 "Seçim listesindeki objenin ID sini göster" + +#: ../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 "" -#: ../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 "Seçim listesindeki objenin ID sini göster" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" -#: ../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 "Görünüm" @@ -7217,54 +7951,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 "Yüklü eklentileri ayarla." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "İndirme listesi" -#: ../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 "Güncelle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Siteleri Ayarla..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../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 "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../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 "Lütfen bir seçim yapınız." +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +msgid "Edit JOSM Plugin description URL." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 -msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 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 "Eklenti sitelerini ayarla" #. 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 "Ayarları Göster" -#: ../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 " @@ -7272,41 +8006,41 @@ msgstr "Programın görünüşünü değiştirmeye yarayan bir çok ayar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Bağlantı Ayarları" -#: ../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 server bağlantı ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Harita Ayarları" -#: ../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 "Harita Projeksiyonu ve İnterpolasyon Ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Ses Ayarları" -#: ../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 "Ses çalıcısı ve ses imleç ayarları." -#: ../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 "Ayarların aktif olamsı için programı açıp/kapatmalısınız." -#: ../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 "koordinatları şu şekilde göster" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projeksiyon türü" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Harita Projeksiyonu" @@ -7339,12 +8073,4 @@ msgid "Proxy server password" msgstr "Proxy server şifresi" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "OSM için asıl link" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Asıl Link" #. 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 @@ -7371,61 +8097,60 @@ msgstr "Kısayol" -#: ../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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "Kopyalamak için bir satır seçiniz." -#: ../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 "" -#: ../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 "Seçili kaynağı listeden sil." -#: ../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 "" @@ -7606,36 +8331,59 @@ msgstr "Düzenleyici Grupları" -#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Yorum Ekle" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Seçili tabakayı sil." + +#: ../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 "Seçilebilen Özellikler:" -#: ../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 "''{1}'' gurubu için ''{0}'' kullan" -#: ../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}'' ı kullan" -#: ../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 "" -#: ../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 @@ -7643,15 +8391,15 @@ msgstr "Etiketteki özellikler okunamadı: {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 "İşleme Hatası {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 "" -#: ../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 @@ -7660,22 +8408,22 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../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 "Özellikleri Değiştir" -#: ../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}''" @@ -7714,11 +8462,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 "Okunamadı \"{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 " @@ -7728,38 +8476,38 @@ "yüklemek istermisiniz?" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "gps iz tanımı" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Yazar bilgisi ekle" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "gerçek İsim" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Öntanımlı" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Copyright yılı" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Anahtar kelimeler" @@ -7769,9 +8517,9 @@ msgstr "Dışarı verme opsiyonları" -#: ../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 "" @@ -7782,10 +8530,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 "Ön tanımlı lisans seçiniz" -#: ../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 @@ -7795,12 +8543,12 @@ msgstr "İmleçler {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 "" -#: ../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" @@ -7821,6 +8569,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 @@ -7830,20 +8578,40 @@ msgstr "OSM bilgisi indiriliyor..." -#: ../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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../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}'' için yapılan aramada herhangi bir ekleme yapılmadı." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7851,34 +8619,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "" -#: ../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 "İçeri alınan koordinatlar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Yanlış cümleler: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Kontoltoplamı hatası: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Bilinmeyen cümleler: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Sıfır koordinatlar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA içeri alınması başarılı" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "NMEA içeri alınmasında hata!" @@ -7889,9 +8657,9 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -7900,15 +8668,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -7916,33 +8684,91 @@ msgstr "" -#: ../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 "Açılıyor..." -#: ../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 "Açılıyor..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Açılıyor..." + +#: ../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 "Açılıyor..." + +#: ../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 "Kapanıyor..." -#: ../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 "Kapanıyor..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Açılıyor..." + +#: ../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 "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Yükleniyor..." -#: ../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}." @@ -7970,42 +8796,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Hatalı kullanıcı adı veya şifre." -#: ../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 "Uyarı: Şifre düz metin olarak ileticektir." -#: ../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 "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Enter Password" -#: ../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 için asıl link" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../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 için login şifresi, herhangi şifre saklamamak için boş bırakınız." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Asıl Link" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM şifresi" -#: ../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." @@ -8014,20 +8848,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8036,5 +8870,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8229,35 +9063,46 @@ "ediniz." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - -#: ../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:104 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "" + +#: ../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 "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." + +#: ../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 "Eklentileri Güncelle" -#: ../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 "" @@ -8270,5 +9115,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." @@ -8277,23 +9122,23 @@ msgstr[1] "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +msgid "Skip download" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -msgid "Skip download" +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 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 "" @@ -8304,30 +9149,30 @@ msgstr "Eklentide hata oluştu {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 "" -#: ../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 "" -#: ../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 "Eklenti Bulunamadı: {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 "En son eklenti güncellemesi {0} gün önce yapıldı." -#: ../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 " @@ -8337,21 +9182,21 @@ "değiştirebilirsin.
" -#: ../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 "Eklentiyi Pasif Yap" -#: ../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 "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?" -#: ../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 " @@ -8361,5 +9206,5 @@ "üzerine yazma yetkisi varmıdır kontrol ediniz." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8367,10 +9212,10 @@ msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu." -#: ../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 "Eklenti Yazarın {0} Olduğunu Belirtiyor." -#: ../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." @@ -8378,9 +9223,9 @@ "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin." -#: ../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 "Eklentiyi Pasif Hale Getireyim mi?" -#: ../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 " @@ -8390,13 +9235,13 @@ "çalıştırın." -#: ../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" @@ -8407,5 +9252,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" @@ -8413,18 +9258,18 @@ msgstr[0] "{0} sitesinden indirilen eklenti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Eklenti bilgisi bulunamadı." -#: ../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 "" -#: ../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 "Bütün eklentiler güncel." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8437,9 +9282,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 "Eksik eklentileri yükle" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8452,35 +9297,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}: Versiyon {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 "Eklenti JOSM ile beraber geliyor." -#: ../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 "Eklentinin açıklaması okunamadı: {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 "Bu kayıdın sonunda." -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Sesin çalıştırılmasında hata" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Birşey Yapma" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "hatayı Bildir" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8494,18 +9339,18 @@ "hatayı bildiriniz" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Beklenmedik Durum" -#: ../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 "Lütfen {0} 'daki problemi bildiriniz" -#: ../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 "Hatayı oluşturan adımları belirtiniz (Mümkün olduğunca detaylı)!" -#: ../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 " @@ -8515,19 +9360,19 @@ "deneyiniz." -#: ../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 "Aşağıdaki bilgiyi eklediğinizden emin olunuz:" -#: ../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 "(Metin zaten panoda mevcut.)" -#: ../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 "" -#: ../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 "" @@ -8536,5 +9381,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8543,5 +9388,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8554,5 +9399,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" @@ -8562,5 +9407,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8571,17 +9416,17 @@ "\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 "(İpucu: Kısayolları Tercihler Penceresinden Değiştirebilirisiniz.)" -#: ../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 "" @@ -8590,4 +9435,39 @@ 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 "" + #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" @@ -8612,9 +9492,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 @@ -8622,27 +9520,40 @@ msgstr "İzleri Yükle" -#: ../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" +#: ../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}" @@ -8650,47 +9561,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 "Bağlanıyor..." -#: ../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 "" -#: ../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 "" -#: ../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 tabakası seçili değil. İz yüklenemez." -#: ../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 "İzleri Yükle" @@ -8803,19 +9714,19 @@ msgstr "Görüntü kümesini yeni bir tabaka olarak kaydet." -#: ../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 Dosyaları (*.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} Dosyası \"{1}\" ismi ile yüklendi" -#: ../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 "Ayrıştırma sırasında hata {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." @@ -8827,34 +9738,34 @@ "seçiniz
" -#: ../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 "Fotoğraf zamanı (exif den):" -#: ../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 zamanı (fotoğraftan okundu): " -#: ../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 " [gg/aa/yyyy sa:dk:sn]" -#: ../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 "Şu zaman dilimindeyim: " -#: ../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 "Tarih Yok" -#: ../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 "Başka bir fotoğraf aç" -#: ../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 receiver ile Fotoğrafın zamanını eşitle" -#: ../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" @@ -8864,69 +9775,69 @@ "Lütfen istenen formatı kullanın" -#: ../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 "Geçersiz Tarih" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../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 izi: " -#: ../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 "Başka GPX izi aç" -#: ../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 "Zamandilimi: " -#: ../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 "Offset:" -#: ../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 alıcımın resmini çizebilirim.
yardımcı olurmu?" -#: ../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 "Burası için pozisyon güncelle: " -#: ../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 "Bütün imajlar" -#: ../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 pozisyonu olmayan imajlar" -#: ../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 "imaj henuz etiketlenmedi" -#: ../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 "imaj ile GPX izini ilişkilendir" -#: ../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 izi seçmelisiniz" -#: ../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 "seçili GPX izi yok" -#: ../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 "" @@ -8937,9 +9848,9 @@ "İstenen format: {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 "Geçersiz zaman dilimi" -#: ../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 "" @@ -8950,65 +9861,65 @@ "İstenen format: {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 "Geçersiz offset" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX izi yüklendi" +#: ../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:694 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java: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." msgstr "" -#: ../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 "" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#, java-format +msgid "Minutes: {0}" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format msgid "Seconds: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 " @@ -9016,13 +9927,13 @@ msgstr "" -#: ../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:883 +msgid "Adjust timezone and offset" +msgstr "" + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -9043,5 +9954,5 @@ msgstr "Dosyada Hata {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9054,12 +9965,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 "Hepsini Seç" - -#: ../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 "Dosya Yüklemede Sorun" @@ -9090,6 +10000,6 @@ #, java-format msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" @@ -9098,21 +10008,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" @@ -9121,37 +10031,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 "" -#: ../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." @@ -9163,18 +10084,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "" -#: ../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 "" -#: ../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 " @@ -9182,5 +10103,5 @@ msgstr "" -#: ../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). " @@ -9188,41 +10109,39 @@ msgstr "" -#: ../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 "" -#: ../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 "" #. 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 "Hızlı ilerleme çarpanı" - -#: ../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 "" -#: ../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 "" -#: ../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 "Hızlı ilerleme çarpanı" - -#: ../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 "" @@ -9278,12 +10197,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "OSM serverına bağlanılıyor..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "görüntü yüklenemedi" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9317,20 +10234,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" @@ -9338,9 +10255,14 @@ 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 +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" @@ -9348,30 +10270,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:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 +#: ../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 "East" -msgstr "doğu" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "kuzey" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Sıfır koordinatlar: " +msgid "Set " +msgstr "Seçiniz" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9433,6 +10364,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)" @@ -9453,6 +10384,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 "Boş Tabaka" @@ -9468,7 +10399,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Tabakalar: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -9990,6 +10921,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 "su" @@ -10002,8 +10933,4 @@ msgid "land" msgstr "yer" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "boş" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10295,9 +11222,9 @@ msgstr "OpenStreet Hata indirme döngüsü" -#: ../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 "OpenStreet hatalarını göster" -#: ../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 " @@ -10306,5 +11233,5 @@ msgstr "" -#: ../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 "" @@ -10869,5 +11796,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 "Sokak Adı" @@ -10886,29 +11813,29 @@ msgstr "Yazar Panosunu göster" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Kullanıcı Sayfasını Göster" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Kullanıcı sayfasını tarayıcıda aç" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Kullanıcı verisi seç" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Seçimi kullanıcı verisi ile değiştir" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "lütfen bir veri seçiniz" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Yazar panosunu kullanan bir kullanıcı seçiniz" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Hata, anonim kullanici ile çalışmaz" @@ -10922,23 +11849,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 "" -#: ../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" @@ -10950,38 +11869,38 @@ "Devam etmek istiyormusunuz?" -#: ../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 "lütfen emin değilseniz iptal ediniz" -#: ../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 "" -#: ../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 " @@ -10989,81 +11908,81 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Yolu Basitleştir" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Yoldan gereksiz noktaları sil." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Lütfen basitleştime için en az bir yol seçiniz." -#: ../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?" @@ -11072,25 +11991,25 @@ msgstr[0] "Seçin {0} kadar yol içeriri. Basitleştireceğinize emin misiniz?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Emin misiniz?" -#: ../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 "Onaylama Hataları" -#: ../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 "Onaylama hatası yok" -#: ../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 "Grid" -#: ../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 "" @@ -11180,53 +12099,53 @@ msgstr "Veri doğruluğunu kontrol et" -#: ../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 "Hatalar içeren veri. Yinede yükle?" -#: ../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 "Onaylama penceresini aç." -#: ../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 "Probleme Yaklaş" -#: ../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 "Onar" -#: ../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 "Seçili hataları onar." -#: ../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 "Yoksay" -#: ../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 "Seçili hatalara gelecek sefere bak." -#: ../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 "Bütün Grup" -#: ../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 "Tek Eleman" -#: ../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 "Hiçbişey" -#: ../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 "Bütünm grubu veya tek elemanları yoksay?" -#: ../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 "elemanlar Yoksayılıyor" -#: ../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" @@ -11250,23 +12169,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 "" "Bu test, iki farklı yol, suyolu veya demiryolunun farklı tabakalarda " "kesişiminifakat kesişen nokta içermemelerini kontrol eder" -#: ../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 "kesişine yollar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "kesişine yollar" -#: ../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 "Çift Noktalar" -#: ../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 "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Aynı isimli noktalar" + +#: ../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 "Çift Yol" + +#: ../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 "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Çiftli yol oluştur" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11350,24 +12302,24 @@ msgstr "Bu test yazım hatalarına karşı test yapar." -#: ../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 "Özellik kontol edici :" -#: ../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 "" "Bu test özellik anahtarlarını ve değerlerindeki yanlışları kontrol eder." -#: ../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 "Geçersiz etkiket kontrol satırı - {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 "Geçersiz imla yanlışı satırı: {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 "" @@ -11378,7 +12330,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 "Geçersiz etiket/anahtar kombinasyonu" @@ -11386,60 +12338,60 @@ #. 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 "Renklendirme problemi" -#: ../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 "Anhatar ''{0}'' geçersiz ." -#: ../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 "Boş değerli etiketler" -#: ../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 "Geçersiz özellik anahtar" -#: ../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 "Özellik anahtarında geçersiz -boşluk- karakteri" -#: ../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 "Özellik anahtarı -boşluk- karakteri ile başlıyor veya bitiyor" -#: ../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 "Özellik anahtarı HTML bilgisi içeriyor" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#, java-format +msgid "Key ''{0}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 -#, java-format -msgid "Key ''{0}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "Beni Düzelt!" -#: ../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 "Özellik anahtarını kontrol et." -#: ../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 "" @@ -11447,22 +12399,22 @@ "kontrol eder." -#: ../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 "Karışık özellik kontrolu kullan." -#: ../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 "" "Özellik anahtar ve etiketlerini karmaşık kuralları kullnarak kontrol et." +#: ../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 "Etiket kontrolcusu kaynağı" -#: ../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." @@ -11471,82 +12423,82 @@ "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası" -#: ../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 "Listeye yeni bir kaynak ekle." -#: ../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 "Seçili kaynağı kontrol et." -#: ../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 "Veri kaynakları" -#: ../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 "Özellik değerlerini kontrol et." -#: ../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 "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." -#: ../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 "Beni Düzelt! leri kontrol et." -#: ../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 "Beni Düzelt! değeri içeren yol veya noktalara bak." -#: ../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 "Renklendirme notlarını kontro let." -#: ../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 "Harita renklendirme hata durumunu kontrol et." -#: ../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 "Varsayılan veri dosyasını kontrol et." -#: ../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 "Varsayılan veri dosyasını kontrol et (önerilen)." +#: ../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 "Varsayılan imla dosyasını kontrol et." -#: ../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 "Varsayılan imla dosyasını kontrol et (önerilen)." -#: ../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 "Özellikler Düzelt" -#: ../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 "Eleman tipi bulunamadı" -#: ../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 "Uyarı seviyesi bulunamadı" -#: ../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 "Hatalı söylem ''{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}''" @@ -11691,7 +12643,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 "yapılar" @@ -11705,5 +12657,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 "alan" @@ -11841,5 +12793,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "İstisna oluştu" @@ -11884,14 +12836,14 @@ msgstr "WMS Eklenti Yardımı" -#: ../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 "Rectifiye İmaj..." -#: ../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}" @@ -11902,26 +12854,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 "" -#: ../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 "" -#: ../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 " @@ -11929,37 +12881,55 @@ msgstr "" -#: ../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 "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "WMS ayarla" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../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 "" @@ -11972,15 +12942,43 @@ msgstr "Otomatik indir" -#: ../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 "atanmış" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {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 tabakası ({0}), görüntü seviyesi {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 "Geçersiz Tarih" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11989,89 +12987,100 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../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 tabakasını dosyaya kaydet" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "WMS tabakasını dosyadan yükle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "" -#: ../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}" msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../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 "Veri yüklemek için boş bir WMS tabakası aç" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "WMS Eklenti Tercihleri" -#: ../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 eklenti menusundeki, WMS server listesini değiştir" -#: ../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 "Menu İsmi" -#: ../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 linki" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Menu ismi (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS linki (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Menu ismi ve WMS linki kullanınız" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Varsayılanı kopyala" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Lütfen en az bir yol seçiniz." + +#: ../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 +msgid "WMS Files (*.wms)" msgstr "" @@ -12436,62 +13445,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 "Referans" - -#. 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 "Tabaka" #. item "Streets/Motorway" combo "Layer" @@ -12506,5 +13460,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 "Şeritler" @@ -12519,5 +13473,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" @@ -12527,10 +13480,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 "Max. hız (km/sa)" @@ -12574,9 +13527,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 "TekYol" @@ -12624,13 +13577,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 "köprü" @@ -12672,13 +13625,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 "Tunel" @@ -12718,12 +13671,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 "Kesen" @@ -12763,12 +13716,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 "toprak set" @@ -12924,17 +13877,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 "" @@ -12961,4 +13914,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" @@ -12977,11 +13931,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 "Yüzey" @@ -12991,4 +13946,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" @@ -13003,9 +13959,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 "kaldırım" @@ -13013,10 +13970,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 "kaldırımsız" + +#: 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 "kulübe" + +#: 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 "araç kiralam" + +#. 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 "orman" + +#: 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 "Park_bileti" #. item "Ways/Track Grade 2" combo "Surface" @@ -13024,12 +14044,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 "parke taşı" + +#: 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 "Çakıl" + +#: 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 "parke taşı" + +#: 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 "eksik" + +#: 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 "ot" + +#: 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 "ot" + +#: 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 "kum" + +#. 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 "toprak" #. item "Streets/Residential" text "Width (meters)" @@ -13110,20 +14212,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Yol kısıtlamaları" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Yol kısıtlamalarını düzenle" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "ücret" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Çıkış Yok" @@ -13136,8 +14238,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 "Erişim" @@ -13172,32 +14274,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 "Evet" @@ -13210,40 +14327,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 "özel" -#: 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 "atanmış" @@ -13256,19 +14373,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 "varış" @@ -13291,65 +14408,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 "ihtiyari" -#: 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 "tarımsal" -#: 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 "hayır" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "mallar" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Ağır araç" @@ -13364,10 +14486,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 "AT" @@ -13383,17 +14505,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 "Motosiklet" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13405,30 +14526,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 "otomobil" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Toplu taşıma araçları" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorboat" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Boat" #. 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 "Min. Hız (km/h)" @@ -13436,27 +14557,27 @@ #. 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 "Max. ağırlık (ton)" #. 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 "DönerKavşak" +msgstr "Döner Kavşak" #. item @@ -13465,5 +14586,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 "Kavşak Düzenle" @@ -13479,5 +14600,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" #. @@ -13485,9 +14606,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 "Tip" @@ -13507,10 +14628,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 "araçyolu" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "otoyol_hat" @@ -13532,10 +14653,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 "ana_hat" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "anayol_hat" @@ -13557,10 +14678,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 "birincil" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "birincil_hat" @@ -13582,5 +14703,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" @@ -13595,9 +14716,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "üçüncül" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "sınıflandırılmamış" @@ -13611,9 +14732,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "yerleşim_alanı" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "canlı_sokak" @@ -13643,10 +14764,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 "servis" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "otobüs_hattı" @@ -13676,6 +14797,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 "inşaat" @@ -13686,10 +14807,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 "Köprü Düzenle" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "" @@ -13697,19 +14818,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Yollar" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "İnşaat" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Otoyolda onarım var olarak düzenle" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Kavşak" @@ -13725,12 +14846,12 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" -msgstr "roundabout-döner kavşak" +msgstr "döner kavşak" #. item "Ways/Construction" text "Width (meters)" #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "At yolu" @@ -13738,5 +14859,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "At yolu düzenle" @@ -13744,5 +14865,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Bisiklet yolu" @@ -13752,11 +14873,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 "Bisiklet yolu düzenle" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Yaya Yolu" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Yürüyüş Yolu" @@ -13765,11 +14892,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Yürüyüş Yolu Düzenle" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Spikes" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Yaya Yolu" @@ -13778,5 +14911,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "yaya yol sokağını düzenle" @@ -13784,5 +14917,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "adımlar" @@ -13792,5 +14925,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 "Uçuş adımları düzenle" @@ -13799,5 +14932,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "İz" @@ -13806,39 +14939,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "İz düzenle" -#: 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 "Çakıl" - -#. 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 "toprak" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "ot" - -#: 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 "kum" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "İz derecesi 1" @@ -13847,5 +14952,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "İz derecesi 1 düzenle" @@ -13853,5 +14958,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "İz derecesi 2" @@ -13860,5 +14965,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "İz derecesi 2 düzenle" @@ -13866,5 +14971,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "İz derecesi 3" @@ -13873,5 +14978,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "İz derecesi 3 düzenle" @@ -13879,5 +14984,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "İz derecesi 4" @@ -13886,5 +14991,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "İz derecesi 4 düzenle" @@ -13892,5 +14997,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "İz derecesi 5" @@ -13899,5 +15004,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "İz derecesi 5 düzenle" @@ -13906,5 +15011,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Yol" @@ -13913,19 +15018,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Yol düzenle" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Kayak" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "kar motosikleti" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Kayak" - #. 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 "gezme" @@ -13935,5 +15043,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 "gezme düzenle" @@ -13941,5 +15049,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Dağ gezisi" @@ -13949,5 +15057,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 "Dağ gezisi düzenle" @@ -13955,5 +15063,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "istenen dağ gezisi" @@ -13963,5 +15071,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 "istenen dağ gezisi düzenle" @@ -13969,5 +15077,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Dağ Gezisi" @@ -13977,5 +15085,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 "Dağ Gezisi düzenle" @@ -13983,5 +15091,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "istenen Dağ Gezisi" @@ -13991,5 +15099,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 "istenen Dağ Gezisi düzenle" @@ -13997,5 +15105,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Zor Dağ Gezisi" @@ -14005,5 +15113,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 "Zor Dağ Gezisi düzenle" @@ -14011,10 +15119,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Yol noktaları" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Otoyol Kavşağı" @@ -14022,15 +15130,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Otoyol Kavşağı birleştirme" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Numara" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Servis" @@ -14038,5 +15146,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Sevis istasyonu düzenle" @@ -14050,4 +15158,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" #. @@ -14067,18 +15177,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 "Operator" @@ -14087,5 +15199,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Trafik ışıkları" @@ -14095,5 +15207,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "" @@ -14102,27 +15214,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 "kontrolsuz" -#: 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 "ada" -#: 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 "" @@ -14130,6 +15242,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 "" @@ -14138,11 +15250,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 "" @@ -14150,30 +15262,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 "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelikan" -#: 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 "Dur" @@ -14181,5 +15293,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "" @@ -14188,14 +15300,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 "" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "" @@ -14206,16 +15318,16 @@ #. 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 "döner kavşak" +msgstr "Dönme Daire" #. item @@ -14223,20 +15335,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 "şehir sınırı" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "şehir sınırı düzenle" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "ikinci isim" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "hız kamerası" @@ -14244,5 +15356,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Acil durum telefonu" @@ -14250,5 +15362,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "" @@ -14256,5 +15368,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "" @@ -14263,10 +15375,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "sığ geçit" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "sığ geçit düzenle" @@ -14274,5 +15386,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Dağ geçidi" @@ -14280,5 +15392,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "dağ geçidi düzenle" @@ -14286,11 +15398,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 "yükseklik" @@ -14298,5 +15410,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Bariyer" @@ -14304,5 +15416,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "direk-iskele" @@ -14310,5 +15422,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "direk-iskele düzenle" @@ -14353,16 +15465,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 "İzin verilen trafik:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "" @@ -14371,5 +15483,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Blok" @@ -14377,5 +15489,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Hayvan Kapısı" @@ -14383,10 +15495,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Hayvan Kapısı Düzenle" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "otobüs geçidi" @@ -14394,15 +15506,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Spikes" #. 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 "gişe" @@ -14410,5 +15522,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "gişe düzenle" @@ -14416,10 +15528,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Sınır kontrol noktası" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Sınır kontrol noktası düzenle" @@ -14429,5 +15541,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Çalı Çit" @@ -14436,5 +15548,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Çit" @@ -14443,5 +15555,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Duvar" @@ -14449,5 +15561,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Şehir Duvarı" @@ -14456,5 +15568,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "istinat duvarı" @@ -14466,15 +15578,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Giriş" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Giriş düzenle" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Geçit" @@ -14482,50 +15594,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Geçit Düzenle" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Kalkan geçit" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "kalkan geçit düzenle" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Hampshire Geçidi" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Hampshire Geçidi Düzenle" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Hız engeli" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Hız engeli düzenle" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "geçit" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "geçit düzenle" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Stil" @@ -14533,25 +15645,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Stil düzenle" #. 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 "Çıkış Kapısı-asker" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Çıkış Kapısı-asker düzenle" @@ -14562,10 +15674,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 "Su" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Spring" @@ -14573,5 +15685,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Spring Düzenle" @@ -14579,5 +15691,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "kanalizasyon" @@ -14585,10 +15697,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "kanalizasyon düzenle" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "dere" @@ -14596,10 +15708,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "dere düzenle" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -14607,10 +15719,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Kanal düzenle" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "nehir" @@ -14620,5 +15732,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 "nehir düzenle" @@ -14626,15 +15738,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Su Düzenle" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Kara" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Kara Düzenle" @@ -14642,15 +15754,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "havza" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "havza kullanım düzenle" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Havuz" @@ -14658,15 +15770,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Havuz Kullanımı Düzenle" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Kapalı Sarnıç" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Kapalı Sarnıç Düzenle" @@ -14674,5 +15786,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Nehirkenarı" @@ -14681,10 +15793,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Nehirkenarı Düzenle" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "sulak alan" @@ -14695,14 +15807,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 "sulak alan düzenle" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "bataklık" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "kenef" @@ -14716,35 +15828,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "batak" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "sazlık alan" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "çolak alan" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "gelgit alanı" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "bataklık ormanı" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Çamur" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Çamur Alan Düzenle" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Sahil" @@ -14752,20 +15864,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Sahil Düzenle" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Koy" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "koy Düzenle" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Uçurum" @@ -14773,10 +15885,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Uçurum Düzenle" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Sahil Çizgisi" @@ -14784,5 +15896,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Sahil Çizgisi Düzenle" @@ -14790,5 +15902,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "feribot hat" @@ -14796,5 +15908,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "feribot hat düzenle" @@ -14803,5 +15915,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Marina" @@ -14809,10 +15921,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Marina düzenle" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "iskele" @@ -14820,5 +15932,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "iskele düzenle" @@ -14826,5 +15938,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Baraj" @@ -14832,15 +15944,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Baraj düzenle" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Su yolu noktası" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Lock Gate" @@ -14849,5 +15961,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "bent" @@ -14855,20 +15967,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "bent dünele" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "şelale" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "şelale düzenle" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "dönüm noktası" @@ -14877,15 +15989,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Marina düzenle" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Kemer" @@ -14893,10 +16005,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Kemer Düzenle" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Feribot Terminal" @@ -14904,10 +16016,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Feribot Terminal düzenle" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Gemi Kızağı" @@ -14917,5 +16029,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 "Gemi Kızağı Düzenle" @@ -14923,10 +16035,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Demiryolu" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Demiryolu" @@ -14934,5 +16046,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Demiryolu düzenle" @@ -14962,8 +16074,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 "seçmeli tipler" @@ -14977,35 +16089,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 "saha" -#: 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 "yük boşaltma yeri" -#: 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 "demiryolu hattı şube-kısa" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Dar geçiş demiryolu" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Dar geçiş demiryolu düzenle" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "tek ray" @@ -15013,45 +16125,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "tek ray düzenle" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Korunmuş" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Korunmuş demiryolu düzenle" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Hafif Ray" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Hafif Ray Düzenle" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Metro" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Metro Düzenle" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tramvay" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Tramvay Düzenle" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Otobüs Yolu" @@ -15059,5 +16171,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Otobüs Yolu Düzenle" @@ -15066,14 +16178,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Kullanılmayan Demiryolu" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Kullanılmayan Demiryolu Düzenle" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Terkedilmiş demiryolu düzenle" @@ -15082,5 +16194,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "hemzemin geçit" @@ -15089,5 +16201,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "geçit" @@ -15097,5 +16209,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "" @@ -15103,5 +16215,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "döner levha" @@ -15110,10 +16222,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "havayolu" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Teleski" @@ -15121,10 +16233,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Teleski Düzenle" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Kayakçı Asansörü" @@ -15132,10 +16244,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Kayakçı Asansörü Düzenle" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Hava tramvayı" @@ -15143,10 +16255,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Hava tramvayı düzenle" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "" @@ -15154,5 +16266,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15160,5 +16272,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 "İstasyon" @@ -15169,10 +16281,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 "İstasyon Düzenle" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Yakıt" @@ -15182,9 +16294,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 "Yakıt düzenle" #. 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 "Açılış saati" + +#. 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" @@ -15204,106 +16545,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Park düzenle" #. 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 "Referans Numarası" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "kat otoparkı" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "yüzey" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "yer altı" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "park_ve_sür" + +#. 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 "Ücret" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "kapasite" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Özürlü Alanı" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Özürlü Alanı" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Özürlü Alanı" + +#: 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 "Yıkama" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Yıkama düzenle" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Alışveriş" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "araçlı alışveriş düzenle" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "tamirci" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "tamirci düzenle" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "araç kiralam" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "araç kiralam düzenle" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Paylaşım Alanı" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Araç Paylaşım alanı düzenle" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Bisiklet parkyeri düzenle" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "kapasite" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "yüzey" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "kat otoparkı" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "yer altı" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "park_ve_sür" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Özürlü Alanı" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Ücret" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Yıkama" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Yıkama düzenle" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Alışveriş" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "araçlı alışveriş düzenle" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "tamirci" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "tamirci düzenle" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "araç kiralam" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "araç kiralam düzenle" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Paylaşım Alanı" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Araç Paylaşım alanı düzenle" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Bisiklet parkyeri düzenle" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "bisiklet kiralama düzenle" @@ -15312,15 +16688,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Bisiklet dükkanı düzenle" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Toplu taşıma" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Referans" @@ -15328,5 +16704,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Demiryolu sonu" @@ -15334,5 +16710,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Son nokta düzenle" @@ -15340,5 +16716,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tramvay durağı" @@ -15347,5 +16723,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "tramvay durağı düzenle" @@ -15353,5 +16729,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Demiryolu platformu" @@ -15360,5 +16736,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Demiryolu platformu düzenle" @@ -15370,5 +16746,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 "referans (iz numarası)" @@ -15376,10 +16752,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 "Alan" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Metro Girişi" @@ -15388,10 +16764,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Metro Girişi Düzenle" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "tekerlekli sandalye" @@ -15400,5 +16776,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "otogar" @@ -15407,5 +16783,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "otogar düzenle" @@ -15413,5 +16789,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "otobüs durağı" @@ -15421,5 +16797,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 "otobüs durağı düzenle" @@ -15428,8 +16804,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 "Sığınak" @@ -15437,10 +16811,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "otobüs platformu" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "otobüs platformu düzenle" @@ -15448,5 +16822,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taksi" @@ -15454,5 +16828,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "taksi istasyonu düzenle" @@ -15460,5 +16834,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Havaalanı" @@ -15466,15 +16840,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 "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15483,5 +16857,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Kalınacak Yerler" @@ -15493,5 +16867,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -15500,15 +16874,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Hotel Düzenle" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stars" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motel" @@ -15516,20 +16890,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Motel Düzenle" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Misafir Evi" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Misafir Evi Düzenle" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "kulübe" @@ -15537,10 +16911,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "külübe düzenle" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Hostel" @@ -15548,30 +16922,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Hostel Düzenle" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Dağcı Barakası" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Dağcı Barakası Düzenle" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Karavan Alanı" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Karavan Alanı Düzenle" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Kamp Sitesi" @@ -15579,10 +16953,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Kamp Sitesi Düzenle" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Yüyecek+içecek" @@ -15593,5 +16967,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -15599,5 +16973,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Restorant Düzenle" @@ -15605,5 +16979,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 "lokanta" @@ -15611,61 +16985,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 "italyan" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "çinli" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "burger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "yunan" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "alman" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "hint" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "yöresel" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "türk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asyalı" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexican" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japanese" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fast Food" @@ -15673,9 +17047,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Fast Food düzenle" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kafe" @@ -15683,10 +17057,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Cafe düzenle" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -15694,20 +17067,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Pub Düzenle" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Biergarten Düzenle" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "" @@ -15715,10 +17086,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 "GeceKlubu" @@ -15726,33 +17096,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "GeceKulubu Düzenle" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turizm" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "İlginç Yerler" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "İlginç Yerler Düzenle" -#. 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 "Açılış saati" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Müse" @@ -15760,10 +17121,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Müze Düzenle" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Hayvanat Bahçesi" @@ -15772,10 +17132,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Hayvanat Bahçesi Düzenle" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Seyir Yeri" @@ -15783,25 +17142,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Seyir Yeri Düzenle" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Seyir Kulesi" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Lunapark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Lunapark Düzenle" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Sanatsal" @@ -15809,5 +17167,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Sanatsal Düzenle" @@ -15815,86 +17173,210 @@ #. 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 "Harita" #. 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 "harita" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "şehir haritası" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "gezirehberi" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "bisikletharitası" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Dur" + +#. 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 "sokak" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "çinli" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Alanı indir" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Yapıştır" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Şehir" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "yöresel" #. 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 "Bisiklet" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Dağ gezisi" + +#. 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 "Kayak" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "yük boşaltma yeri" + +#. 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 "yiyecek noktası" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Sınır kontrol noktası" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "Polis" + +#: build/trans_presets.java:1737 msgid "history" msgstr "tarih" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "doğa" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "vahşiyaşam" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "arazi kullanımı" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" -msgstr "" - -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#: build/trans_presets.java:1740 +msgid "Guidepost" +msgstr "" + +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Bilgi" + +#. 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 "gps iz tanımı" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Ses" + +#. +#: 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 "Telefon Numarası" + +#. 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 "Sığınak Düzenle" @@ -15902,25 +17384,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 "Mangal Alanı" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Piknik Alanı" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Piknik Alanı Düzenle" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Tarihi Alanlar" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Kale" @@ -15929,20 +17411,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Kale Düzenle" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Harabe" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Harabe Düzenle" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Arkeolojik Site" @@ -15951,10 +17432,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Arkeolojik Site Düzenle" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Savaş Alanı" @@ -15962,5 +17442,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Savaş Alanı Düzenle" @@ -15968,15 +17448,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Anıt" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Anıt Düzenle" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Abide" @@ -15984,45 +17464,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Abide Düzenle" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Yol Kenar Geçişi" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Yol Kenar Geçişi Düzenle" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Yolkenarı İbadetyeri" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Yolkenarı İbadetyeri Düzenle" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Dinlenme Alanı" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Su Parkı" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Su Parkı Düzenle" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Oyun Sahası" @@ -16030,15 +17510,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Oyun Sahası Düzenle" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Balıkçılık" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Balıkçılık Düzenle" @@ -16046,15 +17526,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Spor Aktivite" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadyum" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Stadyum Düzenle" @@ -16068,6 +17548,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 "Spor Seç" @@ -16459,30 +17939,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 "spor" @@ -16492,227 +17972,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 "çoğul" -#: 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 "okçuluk" -#: 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 "atletik" -#: 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 "avustralya_footbol" -#: 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 "basebol" -#: 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 "basketbol" -#: 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 "bowling" -#: 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 "çimen bowling" -#: 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 "kano" -#: 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 "tırmanma" -#: 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 "kriket" -#: 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 "cricket nets" -#: 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 "croquet" -#: 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 "bisiklet" -#: 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 "köpek yarışı" -#: 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 "at binicilik" -#: 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 "futbol" -#: 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 "golf" -#: 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 "jimnastik" -#: 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 "hokey" -#: 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 "at_yarışı" -#: 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 "motor" -#: 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 "pelota" -#: 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 "raket" -#: 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 "rugby" -#: 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 "atıcılık" -#: 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 "kaykay" -#: 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 "paten" -#: 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 "kaymak" -#: 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 "futbol" -#: 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 "yüzmek" -#: 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 "masa_tenisi" -#: 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 "tenis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "spor merkezi" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "spor merkezi düzenle" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "atıcılık" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "atıcılık düzenle" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "yarış pisti" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "yarış pisti düzenle" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golf Alanı" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Golf Alanı Düzenle" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minyatür Golf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Minyatür Golf Düzenle" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Spor" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Çoğul" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Çoğul Düzenle" @@ -16751,248 +18229,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 "atıcılık" -#: 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 "spor_merkezi" -#: 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 "stadyum" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "10pin" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "10pin Düzenle" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Atletik" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Atletik Düzenle" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "okçuluk" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "okçuluk düzenle" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "tırmanma" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "tırmanma düzenle" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kano" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Kano Düzenle" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Bisiklet" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Bisiklet Düzenle" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Köpek Yarışı" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Köpek Yarışı Düzenle" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "binicilik" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "binicilik düzenle" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "At Yarışı" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "At Yarışı Düzenle" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "jimnastik" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "jimnastik düzenle" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motor Sporlar" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Motor Sporları Düzenle" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "patinaj" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "patinaj düzenle" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "kaykay" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "kaykay düzenle" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "yüzme" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "yüzme düzenle" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Kayak" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Kayak Düzenle" #. 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 "Atıcılık" @@ -17000,178 +18470,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Atıcılık Düzenle" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Spor (Topla)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Futbol" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Futbol Düzenle" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Amerikan Futbolu" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Amerikan Futbolu Düzenle" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Avustralyan Futbol" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Avustralyan Futbol Düzenle" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Baseball Düzenle" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketbol" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Basketbol Düzenle" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Golf Düzenle" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golf_alanı" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Boule Düzenle" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowling" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Bowling Düzenle" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Kricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Kricket Düzenle" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricket Nets" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Cricket Nets Düzenle" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Kroke" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "kroke Düzelt" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Hockey Düzenle" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Pelota Düzenle" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Raket" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Raket Düzenle" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Rugby Düzenle" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Masa Tenisi" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Masa Tenisi Düzenle" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Tennis Düzenle" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Binalar" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bina" @@ -17179,5 +18649,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Kamu Binası" @@ -17185,10 +18655,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Kamu Binası Düzenle" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "belediye binası" @@ -17196,10 +18666,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "belediye binası düzenle" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Büyükelçilik" @@ -17207,10 +18677,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Büyükelçilik Düzenle" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "adliye sarayı" @@ -17219,10 +18689,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "adliye sarayı düzenle" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Hapishane" @@ -17231,10 +18701,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Hapishane Düzenle" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Polis" @@ -17244,10 +18714,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 "Polis Düzenle" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "İtfaye İstasyonu" @@ -17256,10 +18726,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "İtfaye İstasyonu Düzenle" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postane" @@ -17267,5 +18737,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Postane Düzenle" @@ -17273,15 +18743,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Anaokul" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Anaokul Düzenle" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Okul" @@ -17289,10 +18759,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "okul düzenle" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universite" @@ -17300,10 +18770,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Universite Düzenle" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "kolej" @@ -17311,5 +18781,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "kolej düzenle" @@ -17317,5 +18787,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Sinema" @@ -17324,10 +18794,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Sinema Düzenle" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "kütüphane" @@ -17336,10 +18806,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "kütüphane düzenle" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "sanat merkezi" @@ -17347,10 +18816,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "sanat merkezi düzenle" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Tiyatro" @@ -17359,10 +18828,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Tiyatro Düzenle" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Tapınak" @@ -17372,5 +18841,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 "Tapınak Düzenle" @@ -17379,6 +18848,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 "Din" @@ -17387,66 +18856,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 "bahai" -#: 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 "budist" -#: 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 "hristiyan" -#: 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 "hindu" -#: 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 "jain" -#: 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 "yahudi" -#: 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 "müslüman" -#: 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 "sikh" -#: 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 "spiritualist" -#: 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 "taoist" -#: 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 "Zerdüştlük" -#: 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 "mezhep" @@ -17455,81 +18924,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 "anglikan" -#: 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 "baptist" -#: 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 "katholik" -#: 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 "protestan" -#: 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 "yahova_şahitleri" -#: 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 "lutheran" -#: 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 "methodist" -#: 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 "mormon" -#: 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 "orthodox" -#: 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 "pentecostal" -#: 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 "presbyterian" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adres" @@ -17538,5 +19007,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Adres Bilgileri Düzenle" @@ -17544,5 +19013,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Ev no:" @@ -17550,20 +19019,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Ev İsmi" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Şehir Adı" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Posta Kodu" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Ülke Kodu" @@ -17571,5 +19040,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Adres İnterpolasyon" @@ -17578,5 +19047,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Adres İnterpolasyon Düzenle" @@ -17584,71 +19053,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Numara şeması" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "tek" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "çift" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "hepsi" - -#: 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 "İnsan Yapımı" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Tesis" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Tesis Düzenle" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Kule" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Kule Düzenle" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Su Kulesi" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Su Kulesi Düzenle" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gazdeposu" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Gazdeposu Düzenle" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "DenizFeneri" @@ -17656,10 +19121,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "DenizFeneri Düzenle" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Yeldeğerimeni" @@ -17667,10 +19132,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Yeldeğerimeni Düzenle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Suboru Hattı" @@ -17678,10 +19143,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Suboru hattı Düzenle" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Kanalizasyon Plant" @@ -17691,10 +19156,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 "Kanalizasyon Plant Düzenle" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Vinç" @@ -17702,10 +19167,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Vinç Düzenle" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Fener" @@ -17713,10 +19178,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Fener Düzenle" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Poligon Noktası" @@ -17724,10 +19189,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Poligon Noktası Düzenle" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Gözetim" @@ -17735,5 +19200,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Gözetim Kamera Düzenle" @@ -17741,5 +19206,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Güç Jeneratorü" @@ -17749,39 +19214,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 "Güç Jeneratorü Düzenle" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "rüzgar" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hidro" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fosil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nükleer" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kömür" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "güneş enerjisi" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "benzin" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Güç İstasyonu" @@ -17790,10 +19255,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Güç İstasyonu Düzenle" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Alt Güç İstasyonu" @@ -17802,5 +19267,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Alt Güç İstasyonu Düzenle" @@ -17808,10 +19273,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 "çizgi referansı" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Güç Kulesi" @@ -17822,5 +19287,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 "güç Kulesi Düzenle" @@ -17828,5 +19293,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Güç Hattı" @@ -17835,46 +19300,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Güç Hattı Düzenle" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Voltaj" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Kablo Miktarı" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "hoş mekan" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Tuvalet" -#. 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 "Referans Numarası" - #. 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 "Not" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Posta Kutusu" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -17883,5 +19342,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Telefon Düzenle" @@ -17889,5 +19348,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 "Madeni Para" @@ -17895,5 +19354,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 "Notlar" @@ -17901,5 +19360,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 "Elektronik cüzdan ve Para Değişim Kartları" @@ -17907,5 +19366,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 "ATM kartı" @@ -17913,15 +19372,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 "Kredi Kartı" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefon kart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Geri Dönüşüm" @@ -17930,5 +19389,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Geri Dönüşüm İstasyonu" @@ -17936,80 +19395,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Piller" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Çöp Tenekesi" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Kıyafet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Cam" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Kağıt" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Hurda Metal" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "banket" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Av Standı" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Av Standı Düzenle" -#. 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 "Yükseklik" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "alçak" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "yarım" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "tam" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Sakla" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Kilitle" -#. 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 "Yükseklik" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "alçak" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "yarım" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "tam" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Kaynak" @@ -18018,10 +19473,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Kaynak Düzenle" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "İçme Suyu" @@ -18030,10 +19485,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "İçme Suyu Düzenle" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Bebek Yuvası" @@ -18041,25 +19496,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Bebek Yuvası Düzenle" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Dükkanlar" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Supermarket Düzenle" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "kulübe" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "külübe düzenle" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Bakkal" @@ -18067,10 +19532,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Bakkal Düzenle" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18078,10 +19542,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Kiosk Düzenle" -#. 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 "otobüs durağı düzenle" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Ağaç Düzenle" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Kahve Makinası" @@ -18089,5 +19572,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Kahve Makinası Düzenle" @@ -18095,88 +19578,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Ücretli Ürünler" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "toplu_taşıma_bileti" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "toplu_taşıma_hatları" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "Park_bileti" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "yiyecek" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "içecek" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "tatlı" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "sigara" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "fotoğraf" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "hayvan_besini" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "gazeteler" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "oyuncuklar" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "pullar" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kart" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telefon_kartı" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "bilet" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "kondom" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampon" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "dışkı_poşeti" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "hesap veya üyelik kartı" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "kasap" @@ -18184,10 +19667,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "kasap düzenle" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "fırın" @@ -18195,10 +19677,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "fırın düzenle" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "" @@ -18206,20 +19687,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 "" @@ -18227,60 +19706,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 "" @@ -18288,10 +19761,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 "" @@ -18299,10 +19771,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 "kendin-al-market" @@ -18310,60 +19781,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "kendin-al-market düzenle" -#. 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 "berber" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "berber düzenle" -#. 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 "Kuru Temizleme" @@ -18371,10 +19836,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Kuru Temizleme Düzenle" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Çamaşırhane" @@ -18382,10 +19846,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Çamaşırhane Düzenle" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Dışortam" @@ -18393,35 +19856,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Dış ortam dükkanları düzenle" -#. 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 "Kasa" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banka" @@ -18429,16 +19889,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Banka düzenle" -#. 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 "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Döviz Bürosu" @@ -18446,5 +19904,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Döviz Bürosu Düzenle" @@ -18452,15 +19910,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "ATM Düzenle" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Sağlık" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Doktor" @@ -18468,20 +19926,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Doktor Düzenle" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dişçi" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Dişçi Düzenle" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Eczane" @@ -18489,5 +19945,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Eczane Düzenle" @@ -18495,10 +19951,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Dispenser" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Hastane" @@ -18506,10 +19961,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Hastane Düzenle" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Acil Durum Noktası" @@ -18518,5 +19973,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Acil Durum Noktası Düzenle" @@ -18525,20 +19980,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Nokta Numarası" #. 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 "Telefon Numarası" #. 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 "(Uluslararası kod kullanın, ör +90-212-67890)" @@ -18546,5 +20001,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 "Veteriner" @@ -18553,55 +20008,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Veteriner Düzenle" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kıta" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Kıta Düzenle" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Ülke" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Ülke Düzenle" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "İl" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "İl Düzenle" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Bölge" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Bölge Düzenle" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "vilayet" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "vilayet Düzenle" @@ -18609,15 +20064,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Şehir" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Şehir Düzenle" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Mahalle" @@ -18625,10 +20080,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Mahalle Düzenle" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Banliyo" @@ -18636,25 +20091,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Banliyo Düzenle" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Köy" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Köy Düzenle" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Mezra" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Mezra Düzenle" @@ -18662,5 +20117,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Semt" @@ -18668,10 +20123,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Semt Düzenle" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Ada" @@ -18679,11 +20134,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Ada Düzenle" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "sol" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "külübe düzenle" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Mağara Girişi" @@ -18691,10 +20159,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Mağara Girişi Düzenle" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Zirve" @@ -18702,10 +20170,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Zirve Düzenle" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Buzul" @@ -18713,10 +20181,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Buzul Düzenle" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Volkan" @@ -18724,70 +20192,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Volkan Düzenle" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Belediye Sınırı" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Milli" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Ülke Sınırı Düzenle" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "İdari" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "İdari Sınırları Düzenle" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Sivil" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Sivil Sınırları Düzenle" #. 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 "Politik Sınır Düzenle" #. 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 "Milli Park Sınırı Düzenle" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Arazi Kullanımı" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Ağaç" @@ -18796,15 +20264,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Ağaç Düzenle" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botannik İsim" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Orman" @@ -18813,5 +20281,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Orman Düzenle" @@ -18819,17 +20287,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 "Kozalaklı Orman" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "yaprak düken orman" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "karışık" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "orman" @@ -18838,14 +20306,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "orman kullanımı düzenle" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "korunacak doğa alanı" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "korunacak doğa alanı düzenle" @@ -18853,25 +20321,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Taşlık Alan" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Taşlık Alan Düzenle" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Çalılık" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Çalılık Düzenle" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Dağ Eteği" @@ -18879,10 +20347,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Dağ Eteği Kullanımı" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Sağlıksız Ağaç" @@ -18890,5 +20358,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Sağlıksız Ağaç Düzenle" @@ -18896,5 +20364,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Çiftlik" @@ -18903,45 +20371,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Çiftlik Kullanımı Düzenle" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Çiftlik Arazisi" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Çiftlik Arazisi Kullanımı Düzenle" #. 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 "Bağ" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Bağ Kullanımı Düzenle" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Kiralık Tarım Alanı" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Kiralık Tarım Alanı Düzenle" @@ -18949,25 +20417,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Bahçe" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Bahçe Düzenle" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Otlak" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Otlak Kullanım Düzenle" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Köy Yerleşimi" @@ -18975,10 +20443,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Köy Yerleşimi Düzenle" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Genel" @@ -18986,20 +20454,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Genel Düzenle" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Park Düzenle" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "oyun alanı" @@ -19007,5 +20475,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "oyun alanı kullanımı düzenle" @@ -19013,15 +20481,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Yerleşim Alanı" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Yerleşim Alanı Kullanımı Düzenle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Mezarlık" @@ -19029,9 +20497,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Mezarlık Düzenle" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Mezarlık" @@ -19039,39 +20507,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Mezarlık Kullanımı Düzenle" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Perakende" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Perakende Alan Kullanımı Düzenle" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Ticari" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Ticari Alan Kullanımı Düzenle" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Endüstriyel" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Endüstriyel Alan Kullanımı Düzenle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Demiryolu alanı" @@ -19079,15 +20547,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Demiryolu alanı kullanımı düzenle" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Askeri" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Askeri Alan Düzenle" @@ -19095,55 +20563,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "İnşaat Alanı" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "İnşaat Alanı Düzenle" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Ağaçsız_Alan" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Ağaçsız_Alan Kullanımı Düzenle" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Yeşil Alan" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "yeşil Alan kullanımı düzenle" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Toprak Dolum" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Toprak Dolum Alanı Düzenle" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Taşocağı" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "taşocağı Düzenle" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "" @@ -19153,5 +20621,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 "" @@ -19160,10 +20628,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 "" @@ -19171,5 +20639,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19178,5 +20646,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19184,34 +20652,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 "" @@ -19220,15 +20688,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 "" @@ -19236,5 +20704,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19243,5 +20711,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19249,5 +20717,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19319,5 +20787,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 @@ -19326,17 +20794,17 @@ msgstr "bisiklet" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "otobüs" -#: 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 "" @@ -19389,5 +20857,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 @@ -19396,13 +20864,13 @@ msgstr "ayak" -#: 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 "" @@ -19416,10 +20884,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "" @@ -19427,31 +20895,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 "" @@ -19460,30 +20928,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 "" @@ -19921,11 +21389,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 "kırılmış" @@ -20251,41 +21719,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 "sokak" #. color street @@ -21986,5 +23417,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 "su_lambası" @@ -22583,55 +24014,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22645,5 +24027,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 "turizm" @@ -22715,8 +24097,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 "tarihi" @@ -22787,8 +24169,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 "yeşil" @@ -22802,5 +24184,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "taş_ocağı" @@ -22814,5 +24196,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "toprak_doldurma" @@ -22834,5 +24216,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "havza" @@ -22846,5 +24228,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "orman" @@ -22858,5 +24240,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "çiftlik" @@ -22879,5 +24261,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "perakende" @@ -22891,5 +24273,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "endüstri" @@ -22903,5 +24285,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "ağaçsız_alan" @@ -22915,5 +24297,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "yeşil_alan" @@ -22927,5 +24309,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "demiryolu" @@ -22982,7 +24364,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 "askeri" @@ -22996,5 +24378,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "mezarlık" @@ -23007,5 +24389,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "zirve" @@ -23020,5 +24402,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "buzul" @@ -23032,5 +24414,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "volkanik" @@ -23085,8 +24467,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 "doğal" @@ -23100,5 +24482,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "çalılık" @@ -23112,20 +24494,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "çalılık" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "orman" - #. color water #. 1 @@ -23136,5 +24506,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "çamur" @@ -23148,5 +24518,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "sahil" @@ -23224,8 +24594,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 "rut" @@ -23273,7 +24643,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 "sınırlar" @@ -23415,10 +24785,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 "yer" @@ -23466,6 +24845,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 "adres" @@ -23594,10 +24973,10 @@ #: build/trans_validator.java:40 msgid "oneway tag on a node" -msgstr "kavşaktaki tek yol etiketi" +msgstr "noktada bir tek yön etiketi var" #. node : W : oneway == * #: build/trans_validator.java:41 msgid "bridge tag on a node" -msgstr "kavşaktaki köprü etiketi" +msgstr "noktada bir köprü etiketi var" #. node : W : bridge == BOOLEAN_TRUE @@ -23610,5 +24989,5 @@ #: build/trans_validator.java:46 msgid "wrong highway tag on a node" -msgstr "kavşakta yanlış araçyolu etiketi" +msgstr "noktada yanlış bir yol etiketi var" #. node : W : highway == track @@ -23762,4 +25141,44 @@ msgstr "" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata " +#~ "olarak bildiriniz" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Döküman açık değil Kayıt yapılamaz." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Sil {1} {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Tercihler klasörü açılamıyor: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Yazarlar: {0}" + +#~ msgid "map" +#~ msgstr "harita" + +#~ msgid "citymap" +#~ msgstr "şehir haritası" + +#~ msgid "hikingmap" +#~ msgstr "gezirehberi" + +#~ msgid "bicyclemap" +#~ msgstr "bisikletharitası" + +#~ msgid "board" +#~ msgstr "yiyecek noktası" + #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -23829,7 +25248,4 @@ #~ "selected in the history list." #~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir" - -#~ msgid "Not implemented yet." -#~ msgstr "Henuz Yapılmadı." #~ msgid "Conflicts: {0}" @@ -23918,7 +25334,4 @@ #~ msgid "Change" #~ msgstr "Değiştir" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Çözümle {0} karşıklıkları {1} objelerinde" #~ msgid "true" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 17484) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 17485) @@ -8,6 +8,6 @@ "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-15 13:42+0000\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-08-18 14:23+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,78 +16,81 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\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 @@ -97,154 +100,159 @@ #: ../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] "還有尚未儲存的變更。是否要放棄變更後繼續？" + +#: ../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 "忽略不正確的 URL: \"{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 "忽略格式不良的檔案 URL： \"{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 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -269,7 +277,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" @@ -307,5 +316,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" @@ -329,6 +338,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,13 +354,20 @@ #, 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}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +"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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "請至少選擇一個已上傳的節點、路徑或關係。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -360,5 +376,5 @@ msgstr "" -#: ../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 "" @@ -368,11 +384,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../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 "" @@ -381,5 +397,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 "" @@ -396,11 +412,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 @@ -429,5 +445,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 "緯度" @@ -436,30 +452,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 @@ -473,6 +489,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 @@ -480,58 +496,57 @@ 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 "" @@ -540,10 +555,10 @@ msgstr "" -#: ../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 "" @@ -552,5 +567,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -559,46 +574,46 @@ msgstr "" -#: ../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 "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {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 @@ -608,22 +623,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 "請選擇至少兩個以上的路徑來合併" @@ -634,4 +649,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 " @@ -639,13 +658,13 @@ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +msgid "Reverse and Combine" +msgstr "反轉後組合" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -653,31 +672,26 @@ msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -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: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 " @@ -685,32 +699,32 @@ msgstr "不能組合路徑（它們無法合併為節點的單一字串）" +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -720,20 +734,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 "刪除" @@ -743,85 +757,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 "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -830,6 +845,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 "重製" @@ -853,85 +868,91 @@ 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}」不能為空值(null)" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "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 線上求助中編輯求助頁面" -#: ../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." msgstr "求助頁面遺失。以 english 建立它。" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -985,22 +1006,26 @@ 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 " @@ -1008,77 +1033,73 @@ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？" -#: ../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 "不能合併節點。會刪除仍在使用的路徑。" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" 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 "不能將物件移動到世界外頭" @@ -1086,5 +1107,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 "新增" @@ -1094,17 +1115,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 "" +#: ../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 @@ -1142,21 +1168,17 @@ msgstr "移動節點讓所有角度成為 90 或 270 度" -#: ../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 "請選擇一或多個至少有四個節點的封閉路徑。" -#: ../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 " @@ -1165,9 +1187,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 "直角化" @@ -1183,13 +1205,24 @@ 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}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1215,37 +1248,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 "" +#: ../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 "反轉路徑" @@ -1253,10 +1281,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 "儲存現在的資料" @@ -1267,35 +1296,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 " @@ -1303,28 +1322,28 @@ msgstr "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？" -#: ../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 "將目前的資料儲存為新的檔案。" @@ -1355,38 +1374,38 @@ 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." msgstr[0] "選取的節點不在任何路徑上" -#: ../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 " @@ -1397,19 +1416,19 @@ msgstr[0] "節點上不只有兩個路徑。請同時選取你想切割的路徑。" -#: ../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." msgstr[0] "選取的路徑未包含選取的節點。" -#: ../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 " @@ -1417,5 +1436,5 @@ msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）" -#: ../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 " @@ -1423,5 +1442,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 " @@ -1429,8 +1448,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 @@ -1448,56 +1492,56 @@ 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:124 +#: ../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:125 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 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." msgstr "* 一個路徑且其一或多個節點用於多條路徑。" -#: ../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" @@ -1510,9 +1554,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" @@ -1520,5 +1564,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" @@ -1562,61 +1606,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 +#: ../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 +#: ../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:119 +msgid "There are no selected primitives to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 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 "" @@ -1630,17 +1684,17 @@ msgstr "" -#: ../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 "" @@ -1654,32 +1708,70 @@ "{1}則會放棄並繼續編輯。
" -#: ../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}\"" msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符" -#: ../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 "" -#: ../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 "" -#: ../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 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1687,31 +1779,77 @@ 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] "要加入的物件：" + +#: ../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] "要編輯的物件：" + +#: ../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] "要刪除的物件：" + +#: ../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 @@ -1735,20 +1873,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 "加速快轉" @@ -1790,10 +1928,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 "慢速快轉" @@ -1821,31 +1959,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 "" @@ -1857,20 +1991,20 @@ msgstr "" -#: ../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 @@ -1879,5 +2013,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 " @@ -1887,55 +2021,69 @@ "Ctrl：刪除參考的物件。" -#: ../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 @@ -1943,38 +2091,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." @@ -1982,14 +2130,14 @@ msgstr[0] "插入新的節點到{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 "結束繪製。" @@ -2009,5 +2157,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 "放開滑鼠按鈕以選擇矩形內的物件。" @@ -2018,5 +2166,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 "放開滑鼠按鈕以停止旋轉。" @@ -2033,17 +2181,18 @@ "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" +#: ../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" @@ -2051,30 +2200,34 @@ msgstr[0] "加入並移動虛擬新節點至{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 +#, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" -#: ../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." msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。" -#: ../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-" @@ -2101,60 +2254,60 @@ "動縮放" +#: ../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, " @@ -2164,17 +2317,17 @@ "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)" @@ -2183,92 +2336,93 @@ "(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 "使用者：... - 所有由某使用者改變的物件" +#: ../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 "節點數：... - 含有此數目節點的物件" -#: ../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 "修改過 - 所有改變過的物件" -#: ../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 "選取的 - 所有選取的物件" -#: ../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 "不完整 - 所有不完整的物件" -#: ../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" msgstr "child expr - 所有物件的子項符合正規表示式的" -#: ../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" msgstr "parent expr - 所有物件父項符合正規表示式的" -#: ../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 "使用 | 或 OR 做邏輯或運算" -#: ../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 "使用 \" 將運算子包覆 (例如當設定鍵含有 :)" -#: ../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" @@ -2334,58 +2488,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 "無法讀取 URL：「{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 "URL 解析錯誤：「{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}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../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 +#, java-format +msgid "Add way {0}" +msgstr "" + +#: ../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} 個物件" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "上次改變於 {0}" + +#: ../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 "從 {1} 「{2}」移除「{0}」" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "從 {1} 「{2}」移除「{0}」" + #: ../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 "從 {1} 「{2}」移除「{0}」" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "將 {2}「{3}」設定 {0}={1}" -#: ../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 "將 {2}「{3}」設定 {0}={1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "將 {2}「{3}」設定 {0}={1}" + +#: ../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" @@ -2393,10 +2585,10 @@ msgstr[0] "物件" -#: ../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 "從 {1} {2} 移除「{0}」" -#: ../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}" @@ -2408,5 +2600,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2415,10 +2607,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 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2427,5 +2619,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}''" @@ -2449,44 +2641,56 @@ 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}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "刪除模式" + +#: ../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}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "自關係中刪除" + +#: ../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 "分割路徑區段" @@ -2494,6 +2698,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." @@ -2504,5 +2708,5 @@ "看到的）可能會使用它們。
確定要刪除嗎？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2513,5 +2717,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" @@ -2546,10 +2750,20 @@ msgstr "解決關係 {0} 的成員清單的衝突" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../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" @@ -2562,17 +2776,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 "解決 {1} {2} 中的 {0} 標籤衝突" -#: ../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 "解決 {1} {2} 中的 {0} 標籤衝突" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "解決 {1} {2} 中的 {0} 標籤衝突" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../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} 的版本衝突" @@ -2599,13 +2833,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 "新的角色" @@ -2624,62 +2858,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 "" @@ -2693,29 +2984,36 @@ msgstr "" -#: ../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}" @@ -2727,15 +3025,229 @@ 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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "找到一個以上「從」路徑。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "找到一個以上「到」路徑。" + +#: ../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 "找到一個以上的「經過」。" + +#: ../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 "找不到「從」路徑。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "找不到「到」路徑。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "找到一個以上「經過」路徑。" + +#: ../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 "「從」路徑沒有開始或結束於「經過」節點。" + +#: ../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 "「到」路徑沒有開始或結束於「經過」節點。" + +#: ../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 "「從」路徑沒有開始或結束於「經過」路徑。" + +#: ../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 "「到」路徑沒有開始或結束於「經過」路徑。" + +#: ../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 "路徑「{1}」沒有有用的角色「{0}」。" + +#: ../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 "" + +#: ../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" @@ -2743,22 +3255,7 @@ msgstr[0] "節點" -#: ../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" @@ -2766,12 +3263,7 @@ msgstr[0] "路徑" -#: ../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" @@ -2779,244 +3271,4 @@ msgstr[0] "關係" -#: ../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 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{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} 節點" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "找到一個以上「從」路徑。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "找到一個以上「到」路徑。" - -#: ../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 "找到一個以上的「經過」。" - -#: ../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 "找不到「從」路徑。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "找不到「到」路徑。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "找到一個以上「經過」路徑。" - -#: ../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 "「從」路徑沒有開始或結束於「經過」節點。" - -#: ../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 "「到」路徑沒有開始或結束於「經過」節點。" - -#: ../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 "「從」路徑沒有開始或結束於「經過」路徑。" - -#: ../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 "「到」路徑沒有開始或結束於「經過」路徑。" - -#: ../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 "路徑「{1}」沒有有用的角色「{0}」。" - -#: ../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 "" - -#: ../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" @@ -3029,5 +3281,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "背景" @@ -3037,5 +3289,5 @@ msgstr "突顯" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3045,5 +3297,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3059,21 +3311,21 @@ "並在新的區域開啟新的圖層。" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert Zone (法國)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert Zone (愛沙尼亞)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "麥卡托投影" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3094,8 +3346,8 @@ #: ../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 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3103,17 +3355,101 @@ #: ../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/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/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} 節點" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} 成員" + +#: ../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 和網際網路連線。" -#: ../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 "" @@ -3123,36 +3459,9 @@ msgstr "" -#: ../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 "" @@ -3162,9 +3471,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 "" @@ -3173,9 +3482,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../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 "" @@ -3184,9 +3493,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 "" @@ -3196,9 +3516,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 "" @@ -3208,11 +3528,6 @@ msgstr "" -#: ../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 "" @@ -3230,38 +3545,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 " @@ -3270,5 +3585,5 @@ "下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱" -#: ../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 " @@ -3278,5 +3593,5 @@ "案名稱" -#: ../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 " @@ -3285,75 +3600,94 @@ "加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL" -#: ../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 "於此 url 下載位置 (具有 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 "開啟檔案(若為 .gpx 則是原始 gps)" -#: ../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" @@ -3363,47 +3697,47 @@ "--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." msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。" -#: ../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 @@ -3415,21 +3749,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 "音效" @@ -3469,58 +3803,44 @@ 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 "" - -#: ../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 "" @@ -3532,10 +3852,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 @@ -3594,7 +3908,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" @@ -3610,5 +3923,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" @@ -3711,5 +4024,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 "我的版本" @@ -3720,5 +4033,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" @@ -3732,5 +4045,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 "他們的版本" @@ -3805,6 +4118,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" @@ -3911,10 +4224,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 "未預期的欄位索引。得到 {0}" -#: ../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 "" @@ -3923,19 +4236,19 @@ msgstr "與伺服器溝通時發生錯誤
詳細資料：{0}" -#: ../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 "" @@ -3946,5 +4259,5 @@ "

是否要一併取消這些節點的刪除？" -#: ../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 "取消刪除額外的節點？" @@ -3962,9 +4275,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 " @@ -3972,112 +4285,114 @@ 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
必須將 {0} {1} 的 id 重設為 0。
在下次" "上傳時伺服器會重新分配
新的 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 "重設 id 為 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 "" @@ -4086,21 +4401,21 @@ msgstr "" -#: ../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 "" @@ -4139,10 +4454,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 @@ -4151,10 +4467,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 @@ -4168,5 +4485,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}" @@ -4207,4 +4524,136 @@ 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 +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 +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} 路徑" + +#: ../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} 關係" + +#: ../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} 路徑" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4220,10 +4669,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 @@ -4231,5 +4680,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}" @@ -4260,36 +4709,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 "" @@ -4301,150 +4744,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 "" - -#: ../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 "" -#: ../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 "" - -#: ../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 "" - -#: ../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." @@ -4452,28 +4863,22 @@ msgstr[0] "這會改變 {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" @@ -4481,89 +4886,84 @@ msgstr[0] "改變屬性至 {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 "删除屬性" @@ -4572,34 +4972,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 "" @@ -4632,21 +5032,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} 路徑" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} 關係" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4654,78 +5042,105 @@ 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." msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。" -#: ../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] "作者" + +#: ../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 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../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 "" @@ -4734,47 +5149,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 " @@ -4783,14 +5192,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 "" @@ -4800,9 +5209,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 "" @@ -4812,15 +5221,15 @@ 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" msgstr "" -#: ../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" msgstr "" -#: ../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 " @@ -4828,5 +5237,5 @@ msgstr "" -#: ../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 " @@ -4834,20 +5243,20 @@ msgstr "" -#: ../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 "" @@ -4856,57 +5265,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 " @@ -4915,9 +5324,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 "" @@ -4926,20 +5335,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 @@ -4949,37 +5354,37 @@ msgstr "確定" -#: ../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 "" @@ -4989,30 +5394,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 "" @@ -5026,22 +5431,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 "" @@ -5074,33 +5484,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} 個物件之多的舊設定鍵" - -#: ../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 "先選擇一個書籤。" @@ -5154,13 +5552,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 "空指標例外(Null pointer exception)，可能遺漏某些標籤。" -#: ../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 "不能從伺服器讀取位置搜尋結果" @@ -5168,18 +5566,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 "名稱" @@ -5218,37 +5615,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: " @@ -5257,5 +5654,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 "快速地圖" @@ -5282,47 +5679,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 "載入歷史紀錄" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "載入歷史紀錄" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, java-format +msgid "Loading history for relation {0}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -5640,14 +6065,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5823,8 +6262,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" #. @@ -5921,4 +6366,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6032,6 +6480,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 @@ -6039,156 +6487,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} 由 {2} 建立於 {1} " +#: ../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 @@ -6196,32 +6662,284 @@ msgstr "版本 {0} 由 {2} 建立於 {1}" -#: ../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}」必須不為空值(null)" + +#: ../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] "" + +#: ../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] "" + +#: ../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] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +#, fuzzy +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 +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 "不能讀取點 {1} x {2} 的時刻「{0}」" -#: ../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 @@ -6229,29 +6947,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 "有 Geotag 的圖片" -#: ../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" @@ -6259,14 +6977,14 @@ msgstr[0] "圖片" -#: ../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 @@ -6274,82 +6992,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 "在檔案「{0}」中沒有 EXIF 時刻。" -#: ../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/dd/yyyy HH:MM:SS)" -#: ../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" @@ -6406,5 +7124,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}" @@ -6420,10 +7138,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." @@ -6434,11 +7152,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 @@ -6479,4 +7197,9 @@ "這個動作會發出 {0} 個
個別的下載要求。您是否希望
繼續？" +#: ../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." @@ -6495,74 +7218,74 @@ msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。" -#: ../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" msgstr[0] "軌跡" -#: ../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" msgstr[0] "點" -#: ../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" @@ -6570,5 +7293,5 @@ msgstr[0] "有 {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" @@ -6576,5 +7299,5 @@ msgstr[0] "{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" @@ -6582,14 +7305,14 @@ msgstr[0] "{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" msgstr[0] "標記" -#: ../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" @@ -6607,5 +7330,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}." @@ -6613,5 +7336,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 "在播放時無法於圖層同步。" @@ -6639,5 +7362,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 " @@ -6645,5 +7368,5 @@ msgstr "" -#: ../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 " @@ -6651,29 +7374,29 @@ msgstr "" -#: ../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 "(URL 是： " -#: ../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 @@ -6681,26 +7404,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 @@ -6708,14 +7431,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 "輸入新的設定鍵/數值配對" @@ -6838,40 +7561,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 "顏色" @@ -6915,5 +7638,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "汽車" @@ -6935,16 +7658,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:" #. @@ -6974,12 +7698,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 "步行" @@ -7151,5 +7875,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 "啟動時顯示歡迎畫面" @@ -7157,23 +7881,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 "無模式運作（potlath 式）" -#: ../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 "不需要切換模式（potlath 式工作流程）" -#: ../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 "外觀與感覺" @@ -7205,54 +7940,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 外掛程式描述 URL。" -#: ../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 外掛程式描述 URL。" -#: ../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 " @@ -7260,41 +7995,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 "地圖投影" @@ -7327,12 +8062,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) 的基礎 URL" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "基礎伺服器 URL" #. 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 @@ -7359,61 +8086,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 "" -#: ../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 "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -7588,36 +8314,58 @@ 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} 個物件之多的舊設定鍵" + +#: ../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 "使用群組「{1}」的預設組合「{0}」" -#: ../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 @@ -7625,15 +8373,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 @@ -7642,22 +8390,22 @@ msgstr[0] "改變 {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}''" @@ -7696,11 +8444,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 " @@ -7708,38 +8456,38 @@ msgstr "注意：GPL 與 OSM 授權並不相容，請勿上傳 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 "GPX 檔案" -#: ../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 "授權 {URL}" -#: ../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 "設定鍵" @@ -7749,9 +8497,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 "" @@ -7762,10 +8510,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 @@ -7775,12 +8523,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" @@ -7801,6 +8549,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 @@ -7810,20 +8558,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 +#, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。" -#: ../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 " @@ -7831,34 +8599,34 @@ msgstr "" -#: ../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 "Checksum 錯誤: " -#: ../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 匯入失敗！" @@ -7869,9 +8637,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 "" @@ -7880,15 +8648,15 @@ msgstr "它支援 0.5 和 0.6 版的協定，但是該伺服器說它支援 {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 "使用 {1} 版協定建立與 {0} 的連線" -#: ../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 "" @@ -7896,33 +8664,91 @@ msgstr "" -#: ../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}." @@ -7950,42 +8776,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) 的基礎 URL" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "OSM 帳號的登入名稱 (e-mail)。" -#: ../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 "基礎伺服器 URL" + +#: ../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." @@ -7996,20 +8830,20 @@ "以純文字的方式傳送到伺服器。
請勿使用重要的密碼。" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM 伺服器檔案" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8018,5 +8852,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8209,35 +9043,46 @@ msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。" -#: ../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 "" @@ -8250,5 +9095,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." @@ -8256,23 +9101,23 @@ msgstr[0] "已成功下載 {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 "略過下載" @@ -8283,30 +9128,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 "外掛程式 {1} 要求 外掛程式 {0} 但是找不到。" -#: ../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 " @@ -8316,21 +9161,21 @@ "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 " @@ -8338,5 +9183,5 @@ msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8344,19 +9189,19 @@ 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." msgstr "在回報程式錯誤前請先嘗試將外掛程式升級到最新版本。" -#: ../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 " @@ -8364,13 +9209,13 @@ msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。" -#: ../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" @@ -8381,5 +9226,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" @@ -8387,18 +9232,18 @@ msgstr[0] "從 {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 "" -#: ../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 "" @@ -8411,9 +9256,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 "" @@ -8426,35 +9271,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" @@ -8468,18 +9313,18 @@ "最新版 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} 回報為 ticket" -#: ../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 "包含您導致此錯誤的步驟（愈詳細愈好）！" -#: ../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 " @@ -8487,19 +9332,19 @@ msgstr "在回報錯誤前請先試著更新到最新版的 JOSM 與所有外掛程式。" -#: ../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 "" @@ -8508,5 +9353,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8515,5 +9360,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8526,5 +9371,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" @@ -8534,5 +9379,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8543,21 +9388,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 "" @@ -8584,9 +9464,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 @@ -8594,27 +9492,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}" @@ -8622,47 +9533,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 軌跡" @@ -8775,19 +9686,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." @@ -8798,34 +9709,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 " [dd/mm/yyyy hh:mm:ss]" -#: ../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" @@ -8835,69 +9746,69 @@ "請使用要求的格式" -#: ../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 "" @@ -8908,9 +9819,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 "" @@ -8921,65 +9832,65 @@ "預期的格式：{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 "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" -#: ../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." msgstr "選取的 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 "已比對 {1} 張相片中的 {0} 張到 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 " @@ -8987,13 +9898,13 @@ msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。" -#: ../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 "預設值" @@ -9014,5 +9925,5 @@ msgstr "檔案 {0} 有錯誤" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9025,12 +9936,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 "載入檔案有錯誤" @@ -9059,8 +9969,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" @@ -9071,21 +9981,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 "Cadastre" -#: ../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" @@ -9097,37 +10007,48 @@ "您是否想要回復以 F11 作為抓取動作？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "回復抓取捷徑鍵 F11" -#: ../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 "JOSM 已停止以便讓變更生效。" -#: ../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 "最大快取容量 (MB)" -#: ../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." @@ -9139,18 +10060,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "法國 cadastre 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」的數值" -#: ../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 " @@ -9158,5 +10079,5 @@ msgstr "將原始的白色背景以在 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). " @@ -9164,41 +10085,39 @@ msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。" -#: ../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 "固定大小矩形（預設為 100m）" -#: ../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 到 100 公尺）" -#: ../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 "當超過這個大小時較舊的檔案會自動刪除" @@ -9256,12 +10175,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "正在連接 WMS 伺服器..." +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 @@ -9295,20 +10212,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" @@ -9316,9 +10233,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" @@ -9326,31 +10249,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 "輸入要跳至地點的經/緯。" - -#: ../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 @@ -9414,6 +10345,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)" @@ -9436,6 +10367,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 "空白圖層" @@ -9451,7 +10382,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Cadastre: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -9977,6 +10908,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 "水域" @@ -9989,8 +10920,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 @@ -10277,9 +11204,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 " @@ -10290,5 +11217,5 @@ "在 schokokeks.org。
是否要切換至新的伺服器？（強烈建議）" -#: ../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 伺服器？" @@ -10852,5 +11779,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 "街道名稱" @@ -10869,29 +11796,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 "抱歉，不能用於匿名使用者" @@ -10905,23 +11832,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" @@ -10933,38 +11852,38 @@ "確定要繼續嗎？" -#: ../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 "請選擇至少一個應該連結的封閉路徑。" -#: ../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 " @@ -10972,81 +11891,81 @@ msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。" -#: ../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 "輸入要跳至地點的經/緯。" -#: ../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 "您也可以貼上 www.openstreetmap.org 的 URL" -#: ../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 "無法貼上緯度、經度或縮放。請檢查。" -#: ../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?" @@ -11055,25 +11974,25 @@ msgstr[0] "選擇區域包含 {0} 條路徑。確定要全部簡化？" -#: ../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 "" @@ -11162,53 +12081,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" @@ -11232,21 +12151,54 @@ #: ../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 @@ -11329,23 +12281,23 @@ msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。" -#: ../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 "" @@ -11356,7 +12308,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 "不合法的標籤/數值組合" @@ -11364,80 +12316,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 "設定鍵「{1}」的數值「{0}」不在預設組合中。" -#: ../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 "標籤檢查器來源" -#: ../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." @@ -11447,82 +12399,82 @@ "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 "驗證屬性數值合於預設組合的要求。" -#: ../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:740 +#: ../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:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 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 "使用預設的拼字檢查檔案（建議值）。" -#: ../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}''" @@ -11667,7 +12619,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 "建築" @@ -11681,5 +12633,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 "區域" @@ -11815,5 +12767,5 @@ msgstr "到達交會點" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "發生例外" @@ -11878,14 +12830,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}" @@ -11896,26 +12848,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 " @@ -11923,37 +12875,55 @@ msgstr "無法將整個連結或 id 與選取的服務進行比對。請再試一次。" -#: ../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 "" @@ -11968,105 +12938,145 @@ 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" msgstr "要求的區域太大。請拉近一點，或是改變解析度" -#: ../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}" msgstr "不支援的 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 URL" -#: ../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 "輸入選單名稱和 WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "複製預設值" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../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 "TangoGPS 檔案 (*.log)" #. * @@ -12448,62 +13458,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" @@ -12518,5 +13473,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 "車道數" @@ -12531,5 +13486,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" @@ -12539,10 +13493,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 "最高限速 (km/h)" @@ -12586,9 +13540,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 "單行道" @@ -12636,13 +13590,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 "橋" @@ -12684,13 +13638,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 "隧道" @@ -12730,12 +13684,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 "斷開" @@ -12775,12 +13729,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 "堤防" @@ -12936,17 +13890,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 "寬度 (米)" @@ -12973,4 +13927,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" @@ -12989,11 +13944,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 "路面" @@ -13003,4 +13959,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" @@ -13015,9 +13972,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 "有鋪面的" @@ -13025,10 +13983,72 @@ #: 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 +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" @@ -13036,12 +14056,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)" @@ -13122,20 +14224,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 "沒有出口（死路）" @@ -13148,8 +14250,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 "" @@ -13184,32 +14286,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 "是" @@ -13222,40 +14339,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 "已指定" @@ -13268,19 +14385,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 "目的地" @@ -13303,65 +14420,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 "貨物" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "大型車 (hgv)" @@ -13376,10 +14498,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 "馬" @@ -13395,17 +14517,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" @@ -13417,30 +14538,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 "公共汽車 (psv)" -#: 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 "最低限速 (km/h)" @@ -13448,25 +14569,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 "圓環" @@ -13477,5 +14598,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 "編輯交叉點" @@ -13491,5 +14612,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" #. @@ -13497,9 +14618,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 "類型" @@ -13519,10 +14640,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 "高速公路連絡道路" @@ -13544,10 +14665,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 "快速道路連絡道路" @@ -13569,10 +14690,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 "省道連絡道路" @@ -13594,5 +14715,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" @@ -13607,9 +14728,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 "未分類的" @@ -13623,9 +14744,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 "生活街道" @@ -13655,10 +14776,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 "公車專用道" @@ -13688,6 +14809,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 "施工" @@ -13698,10 +14819,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 "編輯隧道" @@ -13709,19 +14830,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 "交叉點" @@ -13737,5 +14858,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "圓環" @@ -13744,5 +14865,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "馬道" @@ -13750,5 +14871,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "編輯馬道" @@ -13756,5 +14877,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "自行車道" @@ -13764,11 +14885,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 "人行步道" @@ -13777,11 +14904,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 "徒步區" @@ -13790,5 +14923,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "編輯徒步區街道" @@ -13796,5 +14929,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "階梯" @@ -13804,5 +14937,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 "編輯階梯" @@ -13811,5 +14944,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "產業道路" @@ -13818,39 +14951,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" @@ -13859,5 +14964,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "編輯產業道路等級 1" @@ -13865,5 +14970,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" @@ -13872,5 +14977,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "編輯產業道路等級 2" @@ -13878,5 +14983,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" @@ -13885,5 +14990,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "編輯產業道路等級 3" @@ -13891,5 +14996,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" @@ -13898,5 +15003,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "編輯產業道路等級 4" @@ -13904,5 +15009,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" @@ -13911,5 +15016,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "編輯產業道路等級 5" @@ -13918,5 +15023,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "路徑" @@ -13925,19 +15030,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 "健走" @@ -13947,5 +15055,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 "編輯健走" @@ -13953,5 +15061,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "登山" @@ -13961,5 +15069,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 "編輯登山健行" @@ -13967,5 +15075,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "較難的登山健行" @@ -13975,5 +15083,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 "編輯較難的登山健行" @@ -13981,5 +15089,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "高山健行" @@ -13989,5 +15097,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 "編輯高山健行" @@ -13995,5 +15103,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "較難的高山健行" @@ -14003,5 +15111,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 "編輯較難的高山健行" @@ -14009,5 +15117,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "艱難的高山健行" @@ -14017,5 +15125,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 "編輯艱難的高山健行" @@ -14023,10 +15131,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 "高速公路交流道" @@ -14034,15 +15142,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 "休息站" @@ -14050,5 +15158,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "編輯休息站" @@ -14062,4 +15170,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" #. @@ -14079,18 +15189,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 "經營者" @@ -14099,5 +15211,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "交通號誌" @@ -14107,5 +15219,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "行人穿越道類型" @@ -14114,27 +15226,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 "" @@ -14142,6 +15254,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 "以自行車穿越" @@ -14150,11 +15262,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 "行人穿越道類型名稱 (英國)" @@ -14162,30 +15274,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 "禁止通行" @@ -14193,5 +15305,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "行人穿越道" @@ -14200,14 +15312,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 "類型名稱 (英國)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "小型圓環" @@ -14218,14 +15330,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 "" @@ -14235,20 +15347,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 "測速照相" @@ -14256,5 +15368,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "緊急電話" @@ -14262,5 +15374,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "坡" @@ -14268,5 +15380,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "險升/降坡" @@ -14275,10 +15387,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 "編輯淺灘" @@ -14286,5 +15398,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "鞍部" @@ -14292,5 +15404,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "編輯鞍部" @@ -14298,11 +15410,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 "海拔" @@ -14310,5 +15422,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "障礙物" @@ -14316,5 +15428,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "車阻柱" @@ -14322,5 +15434,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "編輯車阻柱" @@ -14365,16 +15477,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 "自行車護欄" @@ -14383,5 +15495,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "水泥護欄" @@ -14389,5 +15501,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "家畜柵欄" @@ -14395,10 +15507,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 "公車專用道障礙" @@ -14406,15 +15518,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 "收費站" @@ -14422,5 +15534,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "編輯收費站" @@ -14428,10 +15540,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 "編輯國境管控站" @@ -14441,5 +15553,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "籬笆" @@ -14448,5 +15560,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "欄柵" @@ -14455,5 +15567,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "牆" @@ -14461,5 +15573,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "城牆" @@ -14468,5 +15580,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "擋土牆" @@ -14478,15 +15590,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 "閘門" @@ -14494,50 +15606,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 "" @@ -14545,25 +15657,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 "編輯城門" @@ -14574,10 +15686,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 "泉" @@ -14585,5 +15697,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "編輯泉" @@ -14591,5 +15703,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "" @@ -14597,10 +15709,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 "溪流" @@ -14608,10 +15720,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 "運河" @@ -14619,10 +15731,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 "河流" @@ -14632,5 +15744,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 "編輯河流" @@ -14638,15 +15750,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 "編輯陸地" @@ -14654,15 +15766,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 "貯水處" @@ -14670,15 +15782,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 "編輯有覆蓋的貯水處" @@ -14686,5 +15798,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "河岸" @@ -14693,10 +15805,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 "溼地" @@ -14707,14 +15819,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 "泥沼" @@ -14728,35 +15840,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 "海灘" @@ -14764,20 +15876,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 "斷崖" @@ -14785,10 +15897,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 "海岸線" @@ -14796,5 +15908,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "編輯海岸線" @@ -14802,5 +15914,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "渡輪路線" @@ -14808,5 +15920,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "編輯渡輪" @@ -14815,5 +15927,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "" @@ -14821,10 +15933,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 "船塢" @@ -14832,5 +15944,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "編輯船塢" @@ -14838,5 +15950,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "水壩" @@ -14844,15 +15956,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 "調節水門" @@ -14861,5 +15973,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "堰" @@ -14867,20 +15979,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 "" @@ -14889,15 +16001,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 "渡頭" @@ -14905,10 +16017,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 "渡輪端點" @@ -14916,10 +16028,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 "船臺" @@ -14929,5 +16041,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 "編輯造船臺" @@ -14935,10 +16047,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 "軌" @@ -14946,5 +16058,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "編輯軌道" @@ -14974,8 +16086,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 "選擇性的類型" @@ -14989,35 +16101,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 "單軌" @@ -15025,45 +16137,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 "導軌道巴士" @@ -15071,5 +16183,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "編輯導軌道巴士" @@ -15078,14 +16190,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 "廢棄的軌道" @@ -15094,5 +16206,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "鐵路平交道" @@ -15101,5 +16213,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "平交道" @@ -15109,5 +16221,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "平交道類型" @@ -15115,5 +16227,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "調車轉盤" @@ -15122,10 +16234,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 "滑雪纜車" @@ -15133,10 +16245,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 "" @@ -15144,10 +16256,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 "纜車" @@ -15155,10 +16267,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 "" @@ -15166,5 +16278,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "" @@ -15172,5 +16284,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 "車站" @@ -15181,10 +16293,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 "加油站" @@ -15194,9 +16306,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" @@ -15216,106 +16557,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 "編輯自行車租用點" @@ -15324,15 +16700,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 "" @@ -15340,5 +16716,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -15346,5 +16722,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -15352,5 +16728,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "路面電車停靠" @@ -15359,5 +16735,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "編輯路面電車停靠" @@ -15365,5 +16741,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "鐵路月台" @@ -15372,5 +16748,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "編輯鐵路月台" @@ -15382,5 +16758,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 "" @@ -15388,10 +16764,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 "地下鐵入口" @@ -15400,10 +16776,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 "" @@ -15412,5 +16788,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "公車車站" @@ -15419,5 +16795,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "編輯公車車站" @@ -15425,5 +16801,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "公車站牌" @@ -15433,5 +16809,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 "編輯公車站牌" @@ -15440,8 +16816,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 "" @@ -15449,10 +16823,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 "編輯公車月台" @@ -15460,5 +16834,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "計程車" @@ -15466,5 +16840,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "編輯計程車招呼站" @@ -15472,5 +16846,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "機場" @@ -15478,15 +16852,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 "" @@ -15495,5 +16869,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "" @@ -15505,5 +16879,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "旅館" @@ -15512,15 +16886,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 "汽車旅館" @@ -15528,20 +16902,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 "" @@ -15549,10 +16923,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 "" @@ -15560,30 +16934,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 "露營區" @@ -15591,10 +16965,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 "食物+飲料" @@ -15605,5 +16979,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "餐廳" @@ -15611,5 +16985,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "編輯餐廳" @@ -15617,5 +16991,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 "烹調風格" @@ -15623,61 +16997,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 "速食" @@ -15685,9 +17059,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 "咖啡" @@ -15695,10 +17069,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 "酒店" @@ -15706,20 +17079,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 "酒吧" @@ -15727,10 +17098,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 "夜店" @@ -15738,33 +17108,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 "博物館" @@ -15772,10 +17133,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 "動物園" @@ -15784,10 +17144,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 "景點" @@ -15795,25 +17154,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 "藝術工作" @@ -15821,5 +17179,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "編輯藝術工作" @@ -15827,86 +17185,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 "市" + +#: 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 "gps 軌跡描述" + +#: 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 "" @@ -15914,25 +17397,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 "城堡" @@ -15941,20 +17424,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 "考古學地區" @@ -15963,10 +17445,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 "戰場" @@ -15974,5 +17455,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "編輯戰場" @@ -15980,15 +17461,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 "紀念碑" @@ -15996,45 +17477,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 "運動場" @@ -16042,15 +17523,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 "編輯釣魚場" @@ -16058,15 +17539,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 "編輯競技揚" @@ -16080,6 +17561,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 "選擇運動：" @@ -16471,30 +17952,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 "運動" @@ -16504,227 +17985,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 "編輯多種" @@ -16763,248 +18242,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 "" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "" -#: 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 "射擊" @@ -17012,178 +18483,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 "建築物" @@ -17191,5 +18662,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "公共建築" @@ -17197,10 +18668,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 "縣市政府/公所" @@ -17208,10 +18679,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 "大使館" @@ -17219,10 +18690,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 "法院" @@ -17231,10 +18702,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 "監獄" @@ -17243,10 +18714,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 "警察局" @@ -17256,10 +18727,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 "消防隊" @@ -17268,10 +18739,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 "郵局" @@ -17279,5 +18750,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "編輯郵局" @@ -17285,15 +18756,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 "學校" @@ -17301,10 +18772,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 "大學" @@ -17312,10 +18783,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 "學院" @@ -17323,5 +18794,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "編輯學院" @@ -17329,5 +18800,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "電影院" @@ -17336,10 +18807,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 "圖書館" @@ -17348,10 +18819,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 "美術館" @@ -17359,10 +18829,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 "劇院" @@ -17371,10 +18841,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 "宗教儀式場所" @@ -17384,5 +18854,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 "編輯宗教儀式場所" @@ -17391,6 +18861,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 "宗教" @@ -17399,66 +18869,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 "教派" @@ -17467,81 +18937,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 "" @@ -17550,5 +19020,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "" @@ -17556,5 +19026,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "" @@ -17562,20 +19032,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 "國碼" @@ -17583,5 +19053,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "" @@ -17590,5 +19060,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "" @@ -17596,71 +19066,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 "燈塔" @@ -17668,10 +19134,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 "風車" @@ -17679,10 +19145,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 "油管" @@ -17690,10 +19156,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 "汙水處理廠" @@ -17703,10 +19169,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 "起重機" @@ -17714,10 +19180,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 "" @@ -17725,10 +19191,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 "測量點" @@ -17736,10 +19202,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 "監視" @@ -17747,5 +19213,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "編輯監視攝影機" @@ -17753,5 +19219,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "發電廠" @@ -17761,39 +19227,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 "" @@ -17802,10 +19268,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 "" @@ -17814,5 +19280,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "" @@ -17820,10 +19286,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 "電塔" @@ -17834,5 +19300,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 "編輯電塔" @@ -17840,5 +19306,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "電線" @@ -17847,46 +19313,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 "電話" @@ -17895,5 +19355,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "編輯電話" @@ -17901,5 +19361,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 "硬幣" @@ -17907,5 +19367,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 "" @@ -17913,5 +19373,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 "電子錢包或收費卡" @@ -17919,5 +19379,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 "" @@ -17925,15 +19385,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 "資源回收" @@ -17942,5 +19402,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "資源回收站" @@ -17948,80 +19408,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 "噴泉" @@ -18030,10 +19486,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 "飲水機" @@ -18042,10 +19498,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 "" @@ -18053,25 +19509,34 @@ #. 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 +msgid "Chemist" +msgstr "" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "編輯市" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "便利商店" @@ -18079,10 +19544,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 "" @@ -18090,10 +19554,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 "自動販賣機" @@ -18101,5 +19584,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "編輯自動販賣機" @@ -18107,88 +19590,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 "肉類" @@ -18196,10 +19679,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 "麵包類" @@ -18207,10 +19689,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 "花類" @@ -18218,20 +19699,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 "酒類" @@ -18239,60 +19718,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 "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "編輯 Hifi 音響店" -#. 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 "園藝中心" @@ -18300,10 +19773,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 "" @@ -18311,10 +19783,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 "DIY 商店" @@ -18322,60 +19793,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "編輯 DIY 商店" -#. 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 "乾洗類" @@ -18383,10 +19848,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 "洗衣店" @@ -18394,10 +19858,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 "戶外用品" @@ -18405,35 +19868,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 "銀行" @@ -18441,16 +19901,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 "自動提款機(ATM)" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "" @@ -18458,5 +19916,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "" @@ -18464,15 +19922,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 "醫師" @@ -18480,20 +19938,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 "藥局" @@ -18501,5 +19957,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "編輯藥局" @@ -18507,10 +19963,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 "醫院" @@ -18518,10 +19973,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 "" @@ -18530,5 +19985,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "" @@ -18537,20 +19992,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)" @@ -18558,5 +20013,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 "獸醫" @@ -18565,55 +20020,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 "編輯縣" @@ -18621,15 +20076,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "市" #. 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 "鄉/鎮" @@ -18637,10 +20092,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 "郊區" @@ -18648,25 +20103,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 "" @@ -18674,5 +20129,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "" @@ -18680,10 +20135,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 "島嶼" @@ -18691,11 +20146,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 "洞窟入口" @@ -18703,10 +20171,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 "峰" @@ -18714,10 +20182,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 "冰河" @@ -18725,10 +20193,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 "火山" @@ -18736,70 +20204,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 "樹" @@ -18808,15 +20276,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 "" @@ -18825,5 +20293,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "" @@ -18831,17 +20299,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 "森林" @@ -18850,14 +20318,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 "編輯自然保育" @@ -18865,25 +20333,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 "" @@ -18891,10 +20359,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 "" @@ -18902,5 +20370,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "" @@ -18908,5 +20376,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "" @@ -18915,45 +20383,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 "" @@ -18961,25 +20429,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 "" @@ -18987,10 +20455,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 "" @@ -18998,20 +20466,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 "" @@ -19019,5 +20487,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -19025,15 +20493,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 "" @@ -19041,9 +20509,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 "" @@ -19051,39 +20519,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 "" @@ -19091,15 +20559,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 "" @@ -19107,55 +20575,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 "" @@ -19165,5 +20633,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 "" @@ -19172,10 +20640,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 "" @@ -19183,5 +20651,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "" @@ -19190,5 +20658,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "" @@ -19196,34 +20664,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 "" @@ -19232,15 +20700,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 "" @@ -19248,5 +20716,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "" @@ -19255,5 +20723,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "" @@ -19261,5 +20729,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "" @@ -19331,5 +20799,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 @@ -19338,17 +20806,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 "" @@ -19401,5 +20869,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 @@ -19408,13 +20876,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 "" @@ -19428,10 +20896,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 "" @@ -19439,31 +20907,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 "" @@ -19472,30 +20940,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 "" @@ -19933,11 +21401,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 "" @@ -20262,41 +21730,4 @@ #: build/trans_style.java:542 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 "" @@ -21998,5 +23429,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 "" @@ -22595,55 +24026,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22657,5 +24039,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 "" @@ -22727,8 +24109,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 "" @@ -22799,8 +24181,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 "" @@ -22814,5 +24196,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "" @@ -22826,5 +24208,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "" @@ -22846,5 +24228,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "" @@ -22858,5 +24240,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "" @@ -22870,5 +24252,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "" @@ -22891,5 +24273,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "" @@ -22903,5 +24285,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "" @@ -22915,5 +24297,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "" @@ -22927,5 +24309,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "" @@ -22939,5 +24321,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "" @@ -22994,7 +24376,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 "" @@ -23008,5 +24390,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "" @@ -23019,5 +24401,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "" @@ -23032,5 +24414,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "" @@ -23044,5 +24426,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "" @@ -23097,8 +24479,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 "" @@ -23112,5 +24494,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "" @@ -23124,18 +24506,6 @@ #. #. -#: 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 "" @@ -23148,5 +24518,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "" @@ -23160,5 +24530,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "" @@ -23236,8 +24606,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 "" @@ -23285,7 +24655,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 "" @@ -23427,10 +24797,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 "" @@ -23478,6 +24857,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 "" @@ -23773,4 +25152,75 @@ msgid "Terraserver Urban" msgstr "" + +#~ 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 "" +#~ "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 "Cannot open preferences directory: {0}" +#~ msgstr "不能開啓偏好設定目錄：{0}" + +#~ msgid "nodes" +#~ msgstr "節點" + +#~ msgid "ways" +#~ msgstr "路徑" + +#~ msgid "relations" +#~ msgstr "關係" + +#~ msgid "changesets" +#~ msgstr "變更組合" + +#~ msgid "Delete Layer" +#~ 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 "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 "unnamed" @@ -23963,7 +25413,4 @@ #~ msgstr "API 初始化失敗" -#~ msgid "image loading..." -#~ msgstr "正在載入圖片..." - #~ msgid "No data" #~ msgstr "沒有資料"